Merge "Add TestApi annotations to LocationManager"