Merge "Migrate FrameworksServicesTests options to Android.bp" into main