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

Change-Id: I2e1c60f0744cd0fb5696231a5e8f173abdfaf04d