Merge "Turn off Dynamic IMS switching for now" am: 2bb0d95e91 am: 9f1ccbf5f9 am: cb8180033a
am: aca8a2a707

Change-Id: I2dc6102e9bd875603f26fcfb87ce34b1a72e1a23