Merge "CSD: Set the default csd property to false" into udc-dev am: 192db65e am: 5f4ecfa0

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



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