[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 -s ours am: ff92f437 -s ours am: 65d5ed8c -s ours

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

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

Change-Id: Ic073590bbbbe94f3f30846ecf79c1fda9353f157