[automerger skipped] Merge "Add CtsShimPrivUpgrade to...

[automerger skipped] Merge "Add CtsShimPrivUpgrade to shim.v2_apk_in_apex_upgrades" into tm-dev am: d6359a85 -s ours am: 1d98cc23 -s ours am: eeca27d5 -s ours

am skip reason: Merged-In I5d2270b8341c0405bf256c417acff4279c6b8754 with SHA-1 c6c98bdf is already in history

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



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