am 03d45ded: am 47c166a9: Merge "Fix deadlock when killing adb bugreport" into lmp-dev

* commit '03d45ded3c81cbff8e646e81a8fcde1e028f4204':
  Fix deadlock when killing adb bugreport