Merge changes from topics "deactivate_all_errors", "deactivate_radio_not_available" am: 6586f342

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2057049



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