[automerger skipped] Merge "CSD: Implement new logic for enabling CSD" into...

[automerger skipped] Merge "CSD: Implement new logic for enabling CSD" into udc-qpr-dev am: 2dcffbe7 am: bf23e6ae -s ours

am skip reason: Merged-In I7b38786c2788e99f5025a9a17ab2ff8d35df722d with SHA-1 4db07a29 is already in history

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



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