Merge "Remove try-catch from LocationPermissionChecker" am: 497afcff0c

Change-Id: Iba17dc925db09447e71e766c5fac254128f820d1