Merge "Add btsnoop_hci.log to bugreport zip (1/2)" am: d95b2eb2f6
am: 7821d52b4e

Change-Id: If0666e35c49942a980c538bf02d29010cfe70545