Merge 0baf92d0 ("xfrm: xfrm_alloc_spi shouldn't use 0 as SPI") into android15-6.6-lts

Steps on the way to 6.6.109

Merges away the above commit, as it is not yet safe to revert in android
trees because of test failures.

Resolves merge conflicts in:
	net/xfrm/xfrm_state.c

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