[automerger skipped] Merge "add KeyphraseEnrollmentInfo to TestApi" into...
[automerger skipped] Merge "add KeyphraseEnrollmentInfo to TestApi" into rvc-dev am: 01b4d5cb am: ac42a7c9 am: 61c87607 am: 019d88e5 -s ours
am skip reason: Change-Id I66558cf849f2815f2c917d128f9f9cc0673750ef with SHA-1 d94f1f7c is in history
Change-Id: I51897faff071229fa9f048550139f83feff28b4c