Merge "Close unused Image before acquire new one" into main am: 9001ecb1 am:...

Merge "Close unused Image before acquire new one" into main am: 9001ecb1 am: 17991ab9 am: c764506e am: 0efc1346

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



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