Merge "Removing com.android.apex.cts.shim.v2_no_hashtree" into main am: 1156406059 am: 91e5451626

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

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