Merge "Migrate test mapping options -> Android.bp" into main am: 01c050a5 am: 3421f6bc

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



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