Merge "don't block adb while running uninstall"
am: 17280c61d3

Change-Id: Ida023bd6f9ba2b309e9443561f9fae43afea15fb