Merge "Do not update packages in encrypted state" into nyc-dev
am: c4f1bc4032

* commit 'c4f1bc40326c10fde55f07230e3fe3067d70fbfa':
  Do not update packages in encrypted state

Change-Id: I84c2c77fb8ff2cc12095f5217c6960a156f2faf3