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

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



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