Merge "ImageWriter: always detach the origially attached buffer" into rvc-dev am: baa0a1fa am: 2ec74bae

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

Change-Id: Ie190a57298ad46e86ca24f94ec8683524046b4a4