Merge "Migrate TestMapping options to Android.bp Presubmit" into main