[automerger skipped] Merge "Avoid wrong telephonymanager with wrong sub id."...

[automerger skipped] Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev am: 6ec886a0 am: 62f6b96b -s ours am: fd853140 -s ours

am skip reason: Change-Id I6bd6975e39c75884252b9d0bcd9d5548dbdfe6d5 with SHA-1 ba845f7f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13413809

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43e7917951351bcf7ebe868f1a044a663d8dfaed