[automerger skipped] Merge "don't block adb while running uninstall" am: 17280c61d3
am: 76ef10f320  -s ours

Change-Id: I479732dda962dae7c04651bb2717e62a6dd05afe