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

Change-Id: I607bc59ea4690d9060bc0222af2aa8f87d49d6cf