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

Change-Id: I26564e52044808330cfef78e49056f4b96b76dc0