Merge "Move UidRange to connectivity" am: 5a81037576 am: 4f6f17230f am: 6dd910c726

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9d41595a21c494931e9bf45bfc4e8b2aa9803f3