Merge "Update checkLocationPermissionInternal not to throw" into main