Merge "Workaround to dump error log instead of exception" into sc-v2-dev am:...

Merge "Workaround to dump error log instead of exception" into sc-v2-dev am: 0eeab2b0 am: 09ff8869

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16489361

Change-Id: I2f125ab44082651982a7422468897d86cff57517