Merge "Unexpected state change for Other category service" into main am: fccb923334 am: dd8c007c00 am: 9ddd8750e1

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

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