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

Change-Id: If9be849f743e9722ca49543a92d33d09978dc6ce