Merge "Merge "Do not clear data for WAPPushManager settings" am: f7c2fd6a am: 13f0cabd am: d39ce659" into pi-dev-plus-aosp