am ee7ed020: am 96e4409e: Merge "Installd: Disallow relocation for decryption"

* commit 'ee7ed02077f1acd5d27575177f4edf2c6939c2e4':
  Installd: Disallow relocation for decryption