Merge "Rename biometric_prompt_service to biometric_service"
am: 7087bf1256

Change-Id: Ideab840443e5086464cb7d93325eaee4af111236