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: fb1d783e am: acb2a710

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



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