Merge "Check for user consent denial when dumping traces." am: cd3d535d38 am: 666ba5d58c
am: e6853a201f

Change-Id: Ifc2858586a420f2aabe0c0ce0a1215737690dd51