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: 2c2a1407 am: 22fa644b

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



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