[automerger skipped] Merge changes from topic "sub_restore" into main am:...

[automerger skipped] Merge changes from topic "sub_restore" into main am: cfa47674 am: f933006c -s ours am: b37334a8 -s ours am: 4765985d -s ours

am skip reason: Merged-In Ie9ba6ed493f73a8597fb5eb4dceb61e9a0c440d1 with SHA-1 ca2f8f26 is already in history

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



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