Merge "Merge "Pass APK_IN_APEX flag when parsing apk in apexes" into tm-dev...

Merge "Merge "Pass APK_IN_APEX flag when parsing apk in apexes" into tm-dev am: 938c3d93 am: cc0bb910 am: 835d6044" into tm-qpr-dev-plus-aosp am: 2a065b13

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18029245



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