Merge "[conflict] Merge "Add new strings that are shown when the user is asked...

Merge "[conflict] Merge "Add new strings that are shown when the user is asked to enter pin/pattern/password instead of biometrics" into udc-dev am: b96e6395 am: 04900eb0" into udc-qpr-dev