Merge changes from topic "replaceUidRange" am: 268a9f56f2 am: a0f1955623 am: 4195f030e7

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

Change-Id: Ibc5e47f175a0e5433492f81068da9f42496e660b
tree: dc670e06d3f484fc64911c80ce41a76f9ed62fd1
  1. framework/
  2. service/
  3. OWNERS