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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e55c3c4bed3d71eb48242428c179809aae00a1f
tree: 74d8bc00d9f6f1aae7b286e889143e7583884691
  1. core/
  2. services/
  3. tests/