Merge "Move Settings privapp-permissions to /product"