Merge "Merge "Fix issue with syncing default voice sub with Telecom." into...
Merge "Merge "Fix issue with syncing default voice sub with Telecom." into qt-dev am: 86cf4150 am: cb3ad0c6" into qt-r1-dev-plus-aosp
am: 70987f24
Change-Id: I27d5eea3bdf64cdf67914f4ce29bee063a27f445