Merge "Update PhoneStateListener#onCallStateChanged Javadoc." am: 6e41b2c5c8
am: 67c9a43605

Change-Id: If333cd7cee4785779cdd4acc8421059c4a947dd2