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

Change-Id: I19303136cc2f813a3ec4e7951fee48a3900915ba