am bbc2b4e6: am 5b31498b: add video/audio chat-compatibility modes to ContactsContract

Merge commit 'bbc2b4e69a1788987a8fe959cc0105290b431283'

* commit 'bbc2b4e69a1788987a8fe959cc0105290b431283':
  add video/audio chat-compatibility modes to ContactsContract