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: 77e36a80

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



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