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