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

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

Change-Id: I22fe65943c2716437816ef3e5ca7e54e2e7bb9e8