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

Merge "Pass APK_IN_APEX flag when parsing apk in apexes" into tm-dev am: 938c3d93 am: cc0bb910 am: 0f484b45 am: f6a1bae9

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



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