Merge "DO NOT MERGE: Change GridViewTest to JUnit4 style" into nougat-mr1-cts-dev am: 730204f695  -s ours am: bcce6e079b am: d875329001
am: bcaa09c3d6  -s ours

Change-Id: Ic9425780ccbf2d4c4245f903d370fd7f7a896820