Merge "Re-enable proguard for Dialer" am: 2789b8de52 am: bba49f0286
am: 458dd1cf44

Change-Id: I0e7900d413ab33e9f6ad9d5665b1fa68b701dc20