Merge "Migrate more of the FrameworksCoreTests to specify options in Android.bp" into main