Merge "nfc(frameworks): Consolidate NFC/SE owners file"