Merge changes from topics "deactivate_all_errors",...

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

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



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