Merge "Add anrd trace to bugreport" into cw-f-dev am: c4178812a4
am: 1df31e315e

Change-Id: I25ef2dc2a113240e1887f4f6d367d589988f9e37