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

Change-Id: I3e6d5ed477b0fd0e1bf69c314e6fd3eb75d64466