Merge "Include stack traces from keystore2 in bugreports on debuggable builds"