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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47515a4c38e96f6e1caa8ceb50e6b83de8c3ec35