Merge "Include stack traces from keystore2 in bugreports on debuggable builds" am: db904dd32c am: 92e674bbe8

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1696845

Change-Id: I71b056572918ddfe12a7b1a14d7fba3eb2f394e9