Merge "cameraserver: Fix DYNAMIC_DEPTH / HEIC keys selected for UHR stream...

Merge "cameraserver: Fix DYNAMIC_DEPTH / HEIC keys selected for UHR stream configurations." into udc-dev am: 16fd990d

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



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