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