Merge "Add CtsShimPrivUpgrade to shim.v2_apk_in_apex_upgrades"