Merge "Remove cts vr tests to accommodate CDD changes" into nougat-cts-dev