Merge changes I88978ab8,I07137c92,Ifdd4db51

* changes:
  Move display test package to sdk 26
  Update AppGridViewTest to sdk 26
  Update AmbientDisplayAlwaysOnPrefTest to sdk 26