Merge "Guard against methods that use the PhoneAccount object pre-MSIM." into...
Merge "Guard against methods that use the PhoneAccount object pre-MSIM." into ub-contactsdialer-b-dev
am: acffe4dd
* commit 'acffe4dd':
Guard against methods that use the PhoneAccount object pre-MSIM.