Merge "Merge "Decrease amount of getAuthenticatorId invocations to the HAL"...
Merge "Merge "Decrease amount of getAuthenticatorId invocations to the HAL" into qt-r1-dev am: 2b418fc3" into qt-r1-dev-plus-aosp
am: f56ac78f
Change-Id: I9eedd906646cbfc66b7853f526b42529d93c2514