Merge "Move UidRange to connectivity" am: 5a81037576 am: 8819459e4a am: ed6b830d7b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9d41595a21c494931e9bf45bfc4e8b2aa9803f3
tree: 40bbfefd07e1b75518e3cd0ee1ce9c4a14e5a34d
  1. core/
  2. services/