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

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

Change-Id: Ie767ae0818210b2f4946450bc6784b89514ff3ad