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