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

Change-Id: I7f3121b8174fd5b53cebef650ca6d7e2f4f2cd1b