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

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

Change-Id: Ic7f04ad2af282654f5a57c9e25e8dad9b78f114c
tree: 5a3db78404b9fbae4cbe8c8afaefe7f6a3711730
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS