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
Change-Id: I280f3d9af2c3ecd8e630d87aad59a95622470f80