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: c9dbfc95 am: c977b93f am: 6b8ad5ca

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



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