am 8aef0332: am f5558872: Merge "Adjust the Javadoc for user authentication timeout." into mnc-dev

* commit '8aef03324d5e41558b6216264c783e920aaf0b99':
  Adjust the Javadoc for user authentication timeout.