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

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

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