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

Change-Id: If7ef28edfe1427e8ef421634e36ee2040aa84afd