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

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



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