Merge "Always update cached copy of authenticatorId. am: 967a9a12a7 am: 5e6b07e09e" into nyc-mr1-dev-plus-aosp
am: da57de1d60

* commit 'da57de1d60d587bf0ed2c2f0f06e13141e758999':

Change-Id: I9bb0f6986a857fceaad8911b7351cd76cb101144