[automerger skipped] Merge "Warn about sensitive bugreport contents." am: 702587e787 am: f0f9fab3c8
am: b7db79becc  -s ours

Change-Id: Ie16b5e76b53094a76c8e2391933b3af7a9459ed7