Merge commit '024fd6749d56b34c22ea0558a786bf747d845be9' of sso://googleplex-android/platform/packages/apps/Dialer into HEAD
Change-Id: I7d222457b7febe15bb0304b51e5c4160fc009b10