Merge "Merge "Decrease amount of getAuthenticatorId invocations to the HAL" into qt-r1-dev am: 2b418fc384" into qt-r1-dev-plus-aosp