Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev am: 6ec886a0e3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1d85c7136b824e69077ea06c68d142a706c2b11