Merge "Pre-grant the location permission to the system Maps app on AAOS for Android T and after"