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

Change-Id: I27595030a5ccad9ebdf42f7756a1ee34e69830d3