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

Merge "Fix race condition in UidRecord cleanup" into rvc-d1-dev am: c453c4af am: 3febd4a3 am: 10761d02

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

Change-Id: I9fc6b3c8ed4ced3c0bc20862bb32909b0180e7d3