Merge "Startup WAP PUSH service before handling SMS messages" am: e4b4df1e28 am: 13797df914 am: fcdef52da4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1336116

Change-Id: I4f83c804058d98a2f0be36de74a8590600955a00