Merge "Merge "Remove PreoptExtractedApk." into main am: ba45ba57 am:...

Merge "Merge "Remove PreoptExtractedApk." into main am: ba45ba57 am: 36c8b1d2" into udc-qpr-dev-plus-aosp am: c283d0ff

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



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