Merge 9fcedaba ("xfrm: xfrm_alloc_spi shouldn't use 0 as SPI") into android16-6.12-lts

Steps on the way to 6.12.50

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

By merging away commit 9fcedaba ("xfrm: xfrm_alloc_spi shouldn't use
0 as SPI") as it still fails internal testing.

Bug: 439335971
Cc: Carlos Llamas <cmllamas@google.com>
Change-Id: I96c457fa4e6b48f06a0d0da980d698328013eaf8
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>