Merge "Hide Wi-Fi and Video calling preferences if IMS service is not ready"
am: 14016104e5

Change-Id: I0bcfe198b2e858be89b4b52a451155e47537c38e