Merge "ConnectivityManager: Provide API's to include location sensitive info" am: a982725793 am: 890fdb016e am: 0659f32f4d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595396

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf60935623b62e29cb2ba52b4de554c7f0d78ef1