Merge "Removes AOSP tests from TEST_MAPPING" into udc-qpr-dev am: 8be8503eb5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/24513233

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