Merge "Merge "Add toString to ST recog event types" into udc-dev am: 05da757a am: ad5b0c7a am: 0d0c53d9" into udc-qpr-dev-plus-aosp am: fad93b90

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



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