Merge "Merge "add KeyphraseEnrollmentInfo to VoiceInteraction dumpsys" into...

Merge "Merge "add KeyphraseEnrollmentInfo to VoiceInteraction dumpsys" into udc-dev am: ae828a78 am: 75b2a0b1 am: 6f57fdfe" into udc-qpr-dev-plus-aosp am: 6b4a7481

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



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