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

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

Change-Id: Ib80cd0ffd45008da0288566ba8887e2a1a4ee30c