Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1
am: be71dbdda7
Change-Id: Id507ea34e3e6f787de3dfb91094f8270d4f26e62
This commit is contained in: