Merge "[RESTRICT AUTOMERGE] Workaround to dump error log instead of exception" into sc-dev am: d5419b7fb5

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

Change-Id: If776107344f78a22639d62ad314c021ca5bd3509