Merge "Clarify PhoneStateListener documentation" am: 69a0fb35a6
am: ed6a99546d

Change-Id: Iad4698465d84ce9874bd9526ed066729f83185b6