[automerger skipped] Replace the usage of UidRange am: f8c3e2eb4e -s ours

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

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

Change-Id: I8baf4176730743ea317fda6aaff56a5a59b55986