Merge "Ensure phone account settings is accessible when SIP not supported." am: b92bf57452
am: 80c2457476

Change-Id: I0c1aac336269d5880bdf2bbffb97f5d03bf923cb