[automerger skipped] Merge "make CtsShim*Prebuilt available to platform" into...

[automerger skipped] Merge "make CtsShim*Prebuilt available to platform" into rvc-dev-plus-aosp am: 9ffca3f4 am: 9034e7e3 am: 644a857f -s ours

am skip reason: Change-Id I5eec7a62e07f9d5138f7fd71268d5dd2ca2e77d4 with SHA-1 ab9f2256 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11954239

Change-Id: I7026f66ae7a6818ecf9fefa630d30ff0ba12d1c7