Merge "Merge "Do not update packages in encrypted state" into nyc-dev am: c4f1bc4032 am: 7397e80504" into nyc-mr1-dev-plus-aosp
am: 6094a6053b

* commit '6094a6053be563a77329fa3b411e99ab1244e90e':

Change-Id: I75cbd30e87905abbdab3826a89abb4de9358e89c