Merge "Merge "Unsuspending packages when a PO or DO is set" into pi-dev am:...
Merge "Merge "Unsuspending packages when a PO or DO is set" into pi-dev am: 24e913e5" into pi-dev-plus-aosp
am: 96471dbe
Change-Id: Ic32837a81ba6c52f3188a8de0596e99327e7b86a