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

Change-Id: I6efff7075d673e059c97c2c57ec85902524c55a5