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

Change-Id: I9a989ca8dcc3bd2e32fa7382008d82d7ea7c100f