Merge "Resolve UidRange dependency between NMS and CS module" am: c3806f72b7 am: d7795cd590

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If34efef1e3b485de6c93f78c4401ea92fa8edfe4