[automerger skipped] Merge changes from topics "default_sub", "default_vonr"...

[automerger skipped] Merge changes from topics "default_sub", "default_vonr" am: ec63139d am: 59f4d4a5 am: e92ed735 -s ours am: fc30bcfd -s ours am: cff82a4f -s ours

am skip reason: Merged-In Ib4a902c73685367edde1a24811c367b0871db683 with SHA-1 00baa890 is already in history

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



Change-Id: I725772c46082ccb39269650b31673c46e288cbfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>