Merge "Merge "Fix memory leak in MultiStateCounter" into tm-dev am: 4b086b73...

Merge "Merge "Fix memory leak in MultiStateCounter" into tm-dev am: 4b086b73 am: f72c6cef" into tm-d1-dev-plus-aosp am: 75a69883

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



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