[automerger skipped] Merge "Fix the issue in ImageWriter Builder class." into...

[automerger skipped] Merge "Fix the issue in ImageWriter Builder class." into tm-dev am: 404db921 am: 6b683473 -s ours

am skip reason: Merged-In I69639cfcd7b486d7dc464d549c8a110cbb2ae89f with SHA-1 7da4d886 is already in history

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

Change-Id: I6ec262ce3da7bbd8cf713d1858aef3fca85db02a