Merge changes I6b4c5d1d,I1b81bbdf

* changes:
  Move enterprise test package to sdk 26
  Update ApplicationListPreferenceCtrlTest to sdk 26