Merge changes from topic "replaceUidRange" am: 1b6c0b7a30 am: 6319e35a0a am: 4195f030e7

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

Change-Id: Ibc5e47f175a0e5433492f81068da9f42496e660b