[automerger skipped] Merge "Rename biometric_prompt_service to biometric_service" am: 7087bf12 am: e230d6dd
am: b115ff5f  -s ours

Change-Id: Ib008c8baffda10d37bd3290c79f93871f5983d47