[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 -s ours am: 72c2ddaf -s ours

am skip reason: Change-Id Ida6f7bb784efe74cc1fa0e8d370eaee803f08b0f with SHA-1 2cd081cf is in history

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

Change-Id: I8ac55b8ff7b731d7b136fe29b4792895ae4d4e52