Merge "Fixed uninstallPackage" into oreo-cts-dev am: ebacbe3720
am: a4df9888c9

Change-Id: I0f598939851cb211cd0ef77bea1f983ec549d7a1