Merge "Merge "Replace CTS with CDD in comment for FEATURE_VR_MODE_HIGH_PERFORMANCE" into nyc-dev am: e54b439 am: c25b1e1" into nyc-mr1-dev-plus-aosp