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 am: 2db27ab9 am: 6d8f6dc6

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



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