Merge "[automerger skipped] [automerger] Add flag to default dialer change...

Merge "[automerger skipped] [automerger] Add flag to default dialer change dialog am: 1a02fa9e am: 4c5c7760 am: 173a9f18 am: 8ace0123 am: 7de39272 am: 24cf84d6 am: 8f3b02ff am: 509b0346 -s ours am: f7592306 -s ours am: f600463d -s ours am: ec2b5148 -s ours am skip reason: change_id I0d5997915a71e317d5c0d654a499d8cbd21f2299 with SHA1 047d2725 is in history" into qt-r1-dev-plus-aosp