Merge 9f95de15 ("xfrm: respect ip protocols rules criteria when performing...

Merge 9f95de15 ("xfrm: respect ip protocols rules criteria when performing dst lookups") into android12-5.10-lts

Steps on the way to 5.10.229

Merges away the changes here as they need to be reverted due to previous
reverts breaking Android abi definitions.  If needed, these can be
brought back later.

Resolves merge conflicts in:
	net/ipv4/xfrm4_policy.c
	net/ipv6/xfrm6_policy.c

Change-Id: I12bf6a283757094dea1a683aa1159998beea498c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>