Merge "Merge "Migrate options in TEST_MAPPING -> Android.bp" into main am: 24a2580651 am: b1ab9eca96" into main