Merge "[framework] Expose setServiceEnabledForCategoryOther as system api." into main