Merge "Update PhoneStateListener#onCallStateChanged Javadoc." am: 6e41b2c5c8 am: 67c9a43605
am: 059f59cc70  -s ours

Change-Id: I01e484836f1ac335414acba266b0abb6e191bedc