Merge "Add check for mAgpsEnabled"