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

Change-Id: I84dd251dd8bbae489327682088fd84e9269e59b4