Merge "Add @RequiresApi to LocationPermissionChecker" into tm-dev-plus-aosp