[automerger skipped] DO NOT MERGE Add flag to default dialer change dialog am: 047d272541 -s ours
am: 5e34166f38

Change-Id: I93076f9238051130d8a2b8e45873c4625770a25a