Merge "Revert "System API used by telephony to bind to WapPushManager app.""