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

[automerger skipped] Merge changes from topics "deactivate_all_errors", "deactivate_radio_not_available" am: 6586f342 am: 3c22996e am: a76612dc -s ours am: 30384dbb -s ours am: 034c2e3b -s ours

am skip reason: Merged-In Ia1f2e5cd63bcf93967ea4fd4a35fcb9515c5e3f3 with SHA-1 83cfcaf9 is already in history

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



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