Merge "Support HDR in skiagl" into udc-dev am: adddf61884

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

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