Merge changes from topics "deactivate_all_errors", "deactivate_no_tds",...

Merge changes from topics "deactivate_all_errors", "deactivate_no_tds", "deactivate_no_tds_revert", "deactivate_radio_not_available" am: 6d9f6c2d

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



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