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

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



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