Merge "[Nfc framework] API to include/exclude Other category service component" into main