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

* commit '9cf822d131634e49a0b7cd8f0e57ae6b620e32b4':
  Installd: Add a swap override flag