Merge "A11y: group caller information together."
am: ea7399a7c0

Change-Id: I0aad07eca4626e0779cbd22106c2843e5ef7d86d