Merge "Migrate test mapping options -> Android.bp" into main