Merge "Rename ro.product.enforce_debugfs_restriction appropriately"