Merge "Update SKU id for config_skuSupportsSecureNfc" into rvc-qpr-dev