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

* commit '7397e80504bf1af3ef015a1fd108557a8551ac52':
  Do not update packages in encrypted state

Change-Id: I5c5cac85700cce1b9cd690dfdca7ffc1ec5f943e