Merge changes from topic "revert-1626206-replaceUidRange-MSYTKFNGUE" am: 0442fab063 am: 07e22a0fd6 am: ed172af621

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

Change-Id: Ia5cedb12112b04885c3f9270b9171c6494b8d2af