Merge "[framework] Expose setServiceEnabledForCategoryOther as system api." into main am: 6a545a3104

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

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