Merge "[Settings] mSubId should not be overridden in...
Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29 am: 1eb4c78a am: a5f3b114 am: d03f6a14 am: f528f545
Change-Id: I72e070350e1b0ceccb5f36178c83ac529fd4251b