Merge "Support P010 with Gralloc2 on Gralloc1 passthrough" am: 89142b4935 am: 96ee08d953

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2208777

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