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

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

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