Merge "Merge "don't block uninstall of unknown packages" into oc-dev am: 627fbf8157 am: e9bec62854" into oc-dr1-dev-plus-aosp