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

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

Change-Id: I9fc6b3c8ed4ced3c0bc20862bb32909b0180e7d3