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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c3474e6522fc67aec5333b323768692619019ee