Merge "Fix a memory leak in UidState." into tm-qpr-dev am: 42b71cc155

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

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