[automerger skipped] Merge "add KeyphraseEnrollmentInfo to TestApi" into...
[automerger skipped] Merge "add KeyphraseEnrollmentInfo to TestApi" into rvc-dev am: 01b4d5cb am: b850ad1f -s ours
am skip reason: Change-Id I66558cf849f2815f2c917d128f9f9cc0673750ef with SHA-1 d3c1f27b is in history
Change-Id: I4ce1f47e5ca25d652fb45f22ab4fc0eeb330db5f