am ad285c16: Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev

* commit 'ad285c169fd55bee8feef6e076a6710c357043e5':
  Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."