Update prebuilt CTS shim pkgs with the ones built on server

system/apex/shim/prebuilts/com.android.apex.cts.shim.v1.apex
package: name='com.android.apex.cts.shim'
versionCode='1'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_additional_file.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_additional_folder.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_different_certificate.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_different_package_name.apex
package: name='com.android.apex.cts.shim.different'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_no_hashtree.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_sdk_target_p.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'P'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_signed_bob.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_signed_bob_rot.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_unsigned_apk_container.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_unsigned_payload.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_with_post_install_hook.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_wrong_sha.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v3.apex
package: name='com.android.apex.cts.shim'
versionCode='3'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v3_signed_bob.apex
package: name='com.android.apex.cts.shim'
versionCode='3'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v3_signed_bob_rot.apex
package: name='com.android.apex.cts.shim'
versionCode='3'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v1.apex
package: name='com.android.apex.cts.shim'
versionCode='1'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_additional_file.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_additional_folder.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_different_certificate.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_different_package_name.apex
package: name='com.android.apex.cts.shim.different'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_no_hashtree.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_sdk_target_p.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'P'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_signed_bob.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_signed_bob_rot.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_unsigned_apk_container.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_unsigned_payload.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_with_post_install_hook.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v2_wrong_sha.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v3.apex
package: name='com.android.apex.cts.shim'
versionCode='3'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v3_signed_bob.apex
package: name='com.android.apex.cts.shim'
versionCode='3'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/com.android.apex.cts.shim.v3_signed_bob_rot.apex
package: name='com.android.apex.cts.shim'
versionCode='3'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

Built here:
https://android-build.googleplex.com/builds/submitted/6438414/CtsShim/latest

This build is suitable for public release.

Bug: 148447155
Test: presubmit
Change-Id: Ic0f821fed2949d9b207a27ada56a662e681d4e16

40 files changed, 0 insertions, 0 deletions

diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v1.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v1.apex
index a5aa6edf..093770b3 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v1.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v1.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2.apex
index 1ab12a6c..b45c93af 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_file.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_file.apex
index 84a9fc78..2c7fb513 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_file.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_file.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_folder.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_folder.apex
index a42d08a0..4829ab72 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_folder.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_folder.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex
index 4f599caf..8f181595 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_certificate.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_certificate.apex
index 8ee5966c..15c9ebf3 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_certificate.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_certificate.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_package_name.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_package_name.apex
index d6e920bf..027cc9f9 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_package_name.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_package_name.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_no_hashtree.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_no_hashtree.apex
index 45edd8b4..88f43553 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_no_hashtree.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_no_hashtree.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_sdk_target_p.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_sdk_target_p.apex
index b5d04cb4..4b4bc9cc 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_sdk_target_p.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_sdk_target_p.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob.apex
index c20a61b2..db369423 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot.apex
index 1b90199e..94726c85 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
index a0d79d5d..59f3c88d 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_unsigned_apk_container.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_unsigned_apk_container.apex
new file mode 100644
index 00000000..1187674c
--- /dev/null
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_unsigned_apk_container.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_unsigned_payload.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_unsigned_payload.apex
new file mode 100644
index 00000000..f6f87195
--- /dev/null
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_unsigned_payload.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_post_install_hook.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_post_install_hook.apex
index 20798e93..d04bf00a 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_post_install_hook.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_post_install_hook.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_pre_install_hook.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
index d53c3243..9b418a01 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_wrong_sha.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_wrong_sha.apex
index 2a3339ad..cee12d87 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_wrong_sha.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_wrong_sha.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v3.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v3.apex
index a1a04199..73320d56 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v3.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v3.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob.apex
index 0f63dde2..03584301 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob_rot.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob_rot.apex
index 8b92d945..4b467f7b 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob_rot.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob_rot.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v1.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v1.apex
index 4fcf7a54..085c1a99 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v1.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v1.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2.apex
index fc7f3d40..9ead68e9 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_file.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_file.apex
index b3fbed8d..2c7fb513 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_file.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_file.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_folder.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_folder.apex
index a5ba9e11..4829ab72 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_folder.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_folder.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex
index 7ecc0a6a..8f181595 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_certificate.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_certificate.apex
index c693b26c..15c9ebf3 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_certificate.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_certificate.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_package_name.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_package_name.apex
index 7c281810..75efea3b 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_package_name.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_package_name.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_no_hashtree.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_no_hashtree.apex
index 31953d60..61e6bff7 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_no_hashtree.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_no_hashtree.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_sdk_target_p.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_sdk_target_p.apex
index fcf2043f..4e28d6a2 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_sdk_target_p.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_sdk_target_p.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob.apex
index 28d28980..a084b94e 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot.apex
index 6447e77b..b8badc56 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
index 5eb830d4..0cced965 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_unsigned_apk_container.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_unsigned_apk_container.apex
new file mode 100644
index 00000000..5962142b
--- /dev/null
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_unsigned_apk_container.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_unsigned_payload.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_unsigned_payload.apex
new file mode 100644
index 00000000..17f4d68c
--- /dev/null
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_unsigned_payload.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_post_install_hook.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_post_install_hook.apex
index 7615ab30..d04bf00a 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_post_install_hook.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_post_install_hook.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_pre_install_hook.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
index 3a94a56a..9b418a01 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_wrong_sha.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_wrong_sha.apex
index 156ebe17..cee12d87 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_wrong_sha.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_wrong_sha.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v3.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v3.apex
index e35ac044..03f1ecb6 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v3.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v3.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob.apex
index 92151a11..3113f25f 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob_rot.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob_rot.apex
index c1af2de3..8c911bbf 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob_rot.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob_rot.apex