Merge "Allow apex to use generated file_contexts" into main am: 6a4bb378 am:...

Merge "Allow apex to use generated file_contexts" into main am: 6a4bb378 am: d5ffaacc am: 746874ef

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2836495



Change-Id: Ic68a6b8d33ebbd96dbb71cf880455262db363f6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>