Merge 365cd15e ("wifi: cfg80211: rewrite merging of inherited elements")...

Merge 365cd15e ("wifi: cfg80211: rewrite merging of inherited elements") into android13-5.15-lts

Steps on the way to 5.15.121

Resolves merge conflicts in:
	net/wireless/scan.c
by merging the commit away entirely.

It will come back in the future in a merge-safe way.

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