[automerger skipped] Merge "Use APK CtsShim prebuilts for flattened apex."...

[automerger skipped] Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev am: 7a726856 am: ceb548cd am: 2f9cb064 -s ours am: 12aa2aa5 -s ours

am skip reason: Change-Id Icc52500cfc0a555e11d1a467b2da0649c7f5d31f with SHA-1 b586dba6 is in history

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

Change-Id: I1054b23ba31fb1f8e0db1730cf9d05ad5dead1ca