Merge "CSD: fix logic for new patches with CSD HAL path" into udc-dev am:...

Merge "CSD: fix logic for new patches with CSD HAL path" into udc-dev am: 91423b80 am: 4f5630c5 am: a0629d12

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



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