Merge "Merge "Failing setPackagesSuspended if user has a DO / PO" into pi-dev am: 694f6000" into pi-dev-plus-aosp