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

Change-Id: I74304193d9133249a7102062f9329a505133b847