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

Change-Id: I0558ce80e38397e7ac20fce63ce6fa8e85ab805d