Merge "Fix race condition in UidRecord cleanup" into rvc-d1-dev am: c453c4aff9

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

Change-Id: I7efa28128e6d794cc39a90643f6ead866b5f0f12