Merge "Use the correct mainline BCP jars for app dexpreopt." into main am:...

Merge "Use the correct mainline BCP jars for app dexpreopt." into main am: 04445d54 am: b39cf834

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



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