Merge "IMS: Show IMS UI options only if Ims feature is ready" am: 8a67a3420d am: a5cb762aac
am: 44bf933029

Change-Id: I891d1bbd0a12d6f37b745b42b50fd80e1bf7e2d0