Merge "Store "block uninstall" flag separately from the rest of package state." into oc-dev
am: 914d4bf10f

Change-Id: Ie0f943598965c23c7ec950bf851a055b355023ff