Merge "Merge "Do not clear data for WAPPushManager settings" am: f7c2fd6a38 am: 13f0cabda8 am: d39ce65953" into pi-dev-plus-aosp
am: dcb1d7fe4f

Change-Id: Ifadf04425c6d939cae7d257e44d8dfa0e89db092