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

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

Change-Id: I29f169684165f4b786a9a95ec14fd5ec56742996
Signed-off-by: Automerger Merge Worker <[email protected]>