Merge changes from topic "replaceUidRange" am: 7b582e9749 am: 38794c5290

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

Change-Id: Ie767ae0818210b2f4946450bc6784b89514ff3ad