Merge "For full & interactive bugreports, collect consent only after critical dumpsys has completed."