[automerger skipped] Merge changes from topics "deactivate_all_errors",...

[automerger skipped] Merge changes from topics "deactivate_all_errors", "deactivate_no_tds", "deactivate_no_tds_revert", "deactivate_radio_not_available" am: 6d9f6c2d am: 8ec81f51 am: 6dbfa8ee -s ours am: 7b443de6 -s ours

am skip reason: Merged-In I62ddc8e7435ed60a259b96239ebbec01e0f72532 with SHA-1 9b306732 is already in history

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



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