[automerger skipped] Merge changes I6ad7b1fe,I12c9e5b5,I202d254a am:...

[automerger skipped] Merge changes I6ad7b1fe,I12c9e5b5,I202d254a am: 9a8ddf5b am: 1d3e8916 -s ours am: 9f98b770 -s ours

am skip reason: Merged-In I6ad7b1fe6f10a18a663ca88c77703d1038908d77 with SHA-1 e7daec3f is already in history

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

Change-Id: I4ae76582d33be808fa18539be7f5c38c9c25f843