Wait for install before enabling services.

Also simplifies some unnecessary logic.

Bug: 330620437
Change-Id: Ibfb599d70aee28d8dec3cbf1ff3e77ad95a6c2bd
Test: testUninstallPackage_DisablesMultipleServices using abtd
1 file changed