Merge "Merge \\"Relax security constraint around getAuthenticatorId().\\" into nyc-dev am: 60c04126c9 am: ef26bf0f0a" into nyc-mr1-dev-plus-aosp