[automerger skipped] Skip ab/6749736 in stage. am: af2d2d4b17 -s ours am: 52af18d1b4 -s ours am: 9fabb745a7 -s ours

am skip reason: Change-Id I72a3e12daf9600cbb06acbff031d0cac7dd934ee with SHA-1 1eeef6c36b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/12797477

Change-Id: I9ef13718890ef2ce22edb1b1bb4460f588664643