[automerger skipped] Merge "Add condition check of KEEP_APEX_INHERIT" am:...

[automerger skipped] Merge "Add condition check of KEEP_APEX_INHERIT" am: 9bfdaf1d am: 4ab0444a am: b9ef653b -s ours

am skip reason: Merged-In Ic5da1c83b3b9c090bc2a24d36b1a4ac936ce1a59 with SHA-1 fec25312 is already in history

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



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