Merge "Installd: Add a swap override flag"