Merge "Merge "[Settings] mSubId should not be overridden in...
Merge "Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29 am: be71dbdd" into rvc-d1-dev-plus-aosp am: d7a99410 am: 00a8e4dc
Change-Id: Ia358b090bf49654d56ea5c9232737e1902326b32