Merge "[Nfc framework] API to include/exclude Other category service component" into main am: 8c7eea4061 am: 5fa6e29c52 am: 35c275dd69

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

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