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

Change-Id: Id756de60fbf644bd772dc07e0f68d35ac4a82c42