Merge "media: fix ImageReader to handle P010 images" am: 7af43734 am: e8b737cb

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



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