Merge "Add RequiresApi annotations to LocationProvider"