am 25b2ed03: Merge "Installd: Add a swap override flag"

* commit '25b2ed03487b7c7b4e5e6897525a169ee32b1998':
  Installd: Add a swap override flag