Merge "[Nfc framework] API to include/exclude Other category service component" into main am: 8c7eea4061 am: 2c97892039

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

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