tree 77bdeb0e3726cc746d21e832469f9146caca0186
parent 737fef293816ade1100cb994ac3715347cb03047
parent 3c22996ef74be293737011fa18ff8885aaff2685
author Sarah Chin <sarahchin@google.com> 1649232744 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649232744 +0000

Merge changes from topics "deactivate_all_errors", "deactivate_radio_not_available" am: 6586f342c4 am: 3c22996ef7

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>