Merge "nfc(api): Add user id in setServiceEnabledForCategoryOther" into main am: 43420b33e4

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

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