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

Change-Id: I73dfc39c26481cfd4ce8235d7a974f4512215d8c