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

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

Change-Id: I2623aa3649636cfa6a010a7dfc1d817e18256084