Merge "Include InputMethodSubtypeSwitchingController in state dump." into mnc-dev