Merge "[automerger skipped] Merge "Update ImageDecoder docs regarding Files" into rvc-dev am: f633705a am: 8c2ca379 -s ours am: b7ed9a39 -s ours" into rvc-qpr-dev-plus-aosp am: fc7ac4da -s ours

am skip reason: Change-Id Icbccdb5183edd0b6a052ec905f999f02ac4e61d3 with SHA-1 e9b2cc82 is in history

Change-Id: I61fb0ae759db625fbc3760d5ac08c063ce4f89e9