Merge "SoundTrigger DeviceState" into udc-dev am: 8e471cfef6 am: c985091a62

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

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