Merge "Make TelephonyManager#setImsRegistrationState multi-sim aware"