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

Change-Id: I4a9b4f277b00659ba0bcfe0ce2ee8084cfeed595