[automerger skipped] Merge "Update location permission check for ConnectivityUtil" am: 1e5d7a90 am: df40c6dd am: d21d3f8d -s ours
am skip reason: Change-Id Ibf8879fe7dbcecdf766b959cb052d4d825b9b24c with SHA-1 38c37b5c is in history
Change-Id: If0bbc9315fef8a5eaa3caf688afe6888833e2390