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

Change-Id: If14cbec8872e66d6423e5d2da924945e10c3cd90