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

Change-Id: Iacdc8756d31f4517f75d8bcab29dbbc36f8df41c