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

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

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