Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount." am: 8223dc1ae9
am: 8b58e73c48

Change-Id: Ifdbfdb2f418297eae83a69196462dc847650e3e2