Merge "Update documentation for Image to be clear on valid format enums." into...

Merge "Update documentation for Image to be clear on valid format enums." into tm-dev am: 82409626 am: f638686c am: 17fc0194 am: 1e5a5567

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



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