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

Merge "Include stack traces from keystore2 in bugreports on debuggable builds" am: db904dd3 am: 92e674bb am: 62c884e0 am: 1c451ac3 am: e4242db2 am: bbd81be0

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

Change-Id: Iac99097119bd12ad7a5ca3186d8ff001cc68b4de