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

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

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