Merge "memory leak: Closes leaked instance" into main am: 7fe439c6 am: a11b31ee

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



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