[automerger skipped] Merge "Collect stack traces from vold in bugreports" am: 97b636e069 am: 928911d9c1 -s ours am: 2abb41eb1f -s ours
am: 2faa9f79e2 -s ours
am skip reason: change_id I28b5b4cb3f45e3090237fe9767f9c3b704e6c43f with SHA1 a8b9c4b850 is in history

Change-Id: I217e6b5dc974cdb620f5b376e1827c6a7212a9bf