Merge changes from topic "revert-1626206-replaceUidRange-MSYTKFNGUE" am: 2576238aec am: 37cb1551a0 am: a2c19b719d

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

Change-Id: Ia5cedb12112b04885c3f9270b9171c6494b8d2af
tree: 543986eeca359d3e0ac2c1354ea0059cef4b833d
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS