Merge "Merge "Remove cts vr tests to accommodate CDD changes" into nougat-cts-dev am: c34014157b" into nougat-mr1-cts-dev