Merge "DO NOT MERGE CTS 7.0_R2 release (Bump version to 7.0 r2)" into nougat-cts-dev