Merge branch 'LNX.LA.3.5.2.2.1_rb1' of git://codeaurora.org/platform/packages/apps/Dialer into cm-11.0

Change-Id: I7497fe21c77475625e990b707a98dbd975187984
(cherry picked from commit 544ad438e0388727f06d1a6aa9656015e507b7aa)