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

Change-Id: If5baf2ffc7b4010c6598ec730d48602b48738cc2