Merge "Do not clear data for WAPPushManager settings"
am: f7c2fd6a38

Change-Id: Ib974cb882cfa9690cdf57c989b636be54e003086