Merge "Move WAPPushManager to /product"
am: b28fac6edd

Change-Id: Ibeab5e60fba0d16e5e713b28e13cccfc7a6d243e