Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev am: e0be4c35ec am: 3503c0e9e7

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/apex/+/11734282

Change-Id: I1aef1ed24bf2e2573fbd01dcebb8508484df47f9