Merge "Change default EXTRA_SUPPORTS_VIDEO_CALLING_FALLBACK to true" am: 5143d7bcaf
am: b82f1fd386

Change-Id: Ie088c9340989c64737d0a6b03f40f063e58e7b96