Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: 1eb4c78a0e am: a5f3b1142a am: d03f6a14d7 am: f528f54591
Change-Id: I72e070350e1b0ceccb5f36178c83ac529fd4251b
This commit is contained in: