Merge "Merge "Add CtsShimPrivUpgrade to shim.v2_apk_in_apex_upgrades" am:...

Merge "Merge "Add CtsShimPrivUpgrade to shim.v2_apk_in_apex_upgrades" am: df27cf8d am: 1b11ca25" into tm-dev-plus-aosp am: f2df35dc am: d3c75442 am: adc468f1

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



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