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: b63cbffa am: 588d554c

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

Change-Id: Ic5e78918e10581a76306945a1866c1249f3429e9