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

Change-Id: If590a0c4873c62d38fa376354634c7cd7e879416