Merge "CSD: Implement new logic for enabling CSD" into udc-qpr-dev am: 2dcffbe76b

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

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