Merge "Update location permission check for ConnectivityUtil"
am: 1e5d7a9020

Change-Id: Ic9a61ab57335f778c856ec226ded08a86dc22fc0