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: 78b5db50 am: 5ec5ac50
Change-Id: I95b460761888220716bd2000976a01bc3ef92524