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

* commit '0b020958a9549926a720890c1bfe550a82e9199d':
  Installd: Add a swap override flag