Merge "Delete local bugreport when consent is denied" am: cf81af96b0 am: 94e234d90b
am: 4369bb2c54

Change-Id: I86957bb07a46064ce0d7408a7c435a0229e73941