Merge "Add DisplayManagerService tests for HDR output control" into udc-dev am: fab0ec06 am: e525768d

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



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