Merge "add KeyphraseEnrollmentInfo to VoiceInteraction dumpsys" into udc-dev am: ae828a78 am: 75b2a0b1

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



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