Merge "Merge "CSD: enable/disable sound dose based on mcc" into udc-dev am:...

Merge "Merge "CSD: enable/disable sound dose based on mcc" into udc-dev am: 0b58c000 am: 098cab02" into udc-d1-dev-plus-aosp am: c9a577be

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



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