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