Merge "Remove possible memory leak on compat ui layer" into udc-qpr-dev am:...

Merge "Remove possible memory leak on compat ui layer" into udc-qpr-dev am: 33158ac7 am: 12989f76

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



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