Merge "Merge "Pass EXTRA_CALLING_PACKAGE for legacy change default dialer/SMS intents." into qt-dev am: 0cdc7e9b98 am: 5871e724de am: fd55f301b6"