Merge "Specify rotation target for CTS shims" into tm-dev am: 3cf51cb436 am: e7d0e09bfd

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

Change-Id: If123f36eb464217c76fd755c23479f1f278cad9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>