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