Merge "SoundTrigger DeviceState" into udc-dev am: 8e471cfe am: c985091a...

Merge "SoundTrigger DeviceState" into udc-dev am: 8e471cfe am: c985091a am: 515e9240 am: 3bb0f3a4

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



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