[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 -s ours am: 56dc12d4 -s ours am: 86849bfa -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: I433acde62dc6df622006fcdfdfe32f5e03236f32