Merge "CSD: add possibility to enable/disable CSD" into udc-dev am: 44383156 am: 049e7f97

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



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