[automerger skipped] Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev am: 7a726856a9
-s ours
am skip reason: Change-Id Icc52500cfc0a555e11d1a467b2da0649c7f5d31f with SHA-1 581be147c7
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11733840
Change-Id: I235b240fb2b93f1db914fdd348f803ed8a02b079
This commit is contained in:
commit
56dc12d42a