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 am: e5effb27 am: 56dc51d1

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



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