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: Iee8b261b25ddd7cab96fdaf70439ac95b82a2c0b