[automerger skipped] Merge "Fix a memory leak in UidState." into udc-dev am:...

[automerger skipped] Merge "Fix a memory leak in UidState." into udc-dev am: a5958f90 am: 331a0b8d -s ours

am skip reason: Merged-In I22e0e266a346f24c7ca0a95bf450320c8b68cbb1 with SHA-1 1635233c is already in history

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



Change-Id: I404082f897d5f56657838ece1cf6be0c3f246277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>