Google Dialer: Merge Lars Greiss's changes from https://gerrit.slimroms.net/#/c/1996/ (PS10)