[automerger skipped] Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev am: 6ec886a0e3 am: 62f6b96b51 -s ours am: fd8531400d -s ours am: 58e6563250 -s ours
am skip reason: Change-Id I6bd6975e39c75884252b9d0bcd9d5548dbdfe6d5 with SHA-1 ba845f7fe4 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: Ic50215d4f07d0d6498fd58644771bedcd75bd405
This commit is contained in: