Merge "Merge "Only check for direct channel support on VR headsets." into pie-cts-dev am: da93ef70d1" am: 50b82d2776 am: 03dcc13252
am: ae9d3fe762

Change-Id: I4f1b0da5608819704fc3880c16282a0ae3444419