[automerger skipped] Merge "[Settings] mSubId should not be overridden in...
[automerger skipped] Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" am: 12677c26 am: 3b7041d9 -s ours
am skip reason: Change-Id I391b034c9badd43094ab52b8b6488bca07ef3c86 with SHA-1 594c267e is in history
Change-Id: I4824ffcd76833deb054fa8143774b83aa8a46782