[automerger skipped] Replace the usage of UidRange am: e0ace0533c -s ours am: 9421da680e -s ours

am skip reason: skip tag Change-Id I4e5aec6ef1ea02e038fcd7ed117a3b67b69c5cb9 with SHA-1 d5034c7e9b is already in history

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

Change-Id: Iedbd693caaa772adde8188c19bb17b2800fa6774
tree: 9398a119e925645b6bf147009bf4a424e3380faa
  1. framework/
  2. service/
  3. services/
  4. tests/
  5. OWNERS
  6. TEST_MAPPING