Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount." am: 8223dc1ae9 am: 8b58e73c48 am: 9e976c8565
am: 4a15007915

Change-Id: I40d164a429d05870b2f760e6740d3f27b3e2f224