Merge "Make ImageWriter thread safe" into tm-qpr-dev am: 59294af84a am: 080ac0f111

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

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