Merge "Migrate more of FrameworksServicesTests to use options from Android.bp" into main