[automerger skipped] Merge "Reverted ag/16684151" am: c209ae48 am:...

[automerger skipped] Merge "Reverted ag/16684151" am: c209ae48 am: c666d8d9 am: b47a272b -s ours am: 301cd26c -s ours

am skip reason: Merged-In I5211c499628dc0d027669ed5a0e52a9091084a89 with SHA-1 0ba86a57 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2021196

Change-Id: Icaeecdd5848e3ec97c6f8ba0280a8799f7002fb1