Merge "Don't expose default strong auth timeout as constant" into nyc-mr1-dev
am: a6b3caf58e

Change-Id: I9763e78b50a98dcf1139cdc299a8944e94c824d9