[automerger skipped] Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev-plus-aosp am: f3c2823040
am: e93b598eb8
am: ae2159dbcf
-s ours
am skip reason: Change-Id Icc52500cfc0a555e11d1a467b2da0649c7f5d31f with SHA-1 e23fd86f1b
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11789975
Change-Id: I8e2dbb0adc95339ab04074ee559c152bb6b36ea4
This commit is contained in: