Merge "Merge "Clean up usage of Settings.Secure.DIALER_DEFAULT_APPLICATION."...
Merge "Merge "Clean up usage of Settings.Secure.DIALER_DEFAULT_APPLICATION." into qt-dev am: 4e7f9548 am: 3764b3b2" into qt-r1-dev-plus-aosp
am: e046dd42
Change-Id: Ic93dc5d7ac0b4a80eafdbec77c4b3ba115da3da8