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