Merge changes from topic "revert-1626206-replaceUidRange-MSYTKFNGUE" am: 35b926cc47

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

Change-Id: I311d4e3e5718afbe7d9817a4c85040d8afe5d66d
tree: b3bcc1e86898eb14e8517a5fbbc9d63c242c0dff
  1. framework/
  2. service/
  3. OWNERS