[automerger skipped] Merge "Fix a memory leak in UidState." into tm-qpr-dev...

[automerger skipped] Merge "Fix a memory leak in UidState." into tm-qpr-dev am: 42b71cc1 am: 5367bd7b -s ours am: 43a25b90 -s ours am: 8c61ea14 -s ours

am skip reason: Merged-In I22e0e266a346f24c7ca0a95bf450320c8b68cbb1 with SHA-1 942ff8eb is already in history

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



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