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