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