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

* commit '3b894ae0f6f716c4ac39e6097788123bf14d1718':

Change-Id: I0ca828df6ba5edc1ec0d62490ed7052d6b12ca2f