Merge "framework-nfc: add aconfig_declarations block" into main