[automerger skipped] Replace the usage of UidRange am: 142408a4 -s ours am: 67a4e2b4 -s ours am: b68e0c3c -s ours am: f63da03f -s ours

am skip reason: Merged-In I4e5aec6ef1ea02e038fcd7ed117a3b67b69c5cb9 with SHA-1 265f23d6 is already in history

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

Change-Id: I86897f089f1a59daa8b86341f1bc1ae5acad2cf3