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

Change-Id: I032ba099ea09fe2154721cbaad5bbae7cd394790