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

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



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