Merge "gs-common: nfc: st21nfc: Add rules for android.hardware.nfc-service.st" into main