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

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

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