Merge "Add uid/pid to soundtrigger dumpsys sessions" into udc-qpr-dev am: ab1f8f0f am: 5bc416c9

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



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