[automerger skipped] Merge changes from topic "unknown_handover" am:...

[automerger skipped] Merge changes from topic "unknown_handover" am: 0ad1f820 am: d25b63c7 am: cbbb39e5 -s ours am: f150368b -s ours am: 68c87d5e -s ours

am skip reason: Merged-In Iea2643539993ef80134203bf57f89448cdc3e37d with SHA-1 28ba158a is already in history

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



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