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

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



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