Merge "Add btsnoop_hci.log to bugreport zip (1/2)"