[automerger skipped] Merge "dex_import can be added to apex" into rvc-dev am:...

[automerger skipped] Merge "dex_import can be added to apex" into rvc-dev am: d7fdfd6e am: 16bb1941 -s ours

am skip reason: Change-Id Ida6f7bb784efe74cc1fa0e8d370eaee803f08b0f with SHA-1 77acec63 is in history

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

Change-Id: I45f481d4291ac1ef344138522f9c44cc11701dba