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

* commit '2a7c8c8024895c3270d4351e6ca4a364d598d52c':
  Do not update packages in encrypted state

Change-Id: Ib0c5e3b003769c150631c7768918552902124456