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

Change-Id: I51f2e78f947701430c7a8699f230dfe4ae8cca7a