Merge "Migrating test options From TEST_MAPPING -> Android.bp" into main am: 11514e7413

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

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