am 8ff1a5ee: am 56206042: am bdc6cde7: Merge "Fix PhoneStateListener constructor javadoc."

* commit '8ff1a5ee0df9abba4fc63bcfc93efbda4a176255':
  Fix PhoneStateListener constructor javadoc.