Merge changes I8668be19,Ifb7769a1

* changes:
  move defaultapps package to sdk 26
  Update DefaultAppInfoTest to sdk 26