[automerger skipped] Merge "[RESTRICT AUTOMERGE] Workaround to dump error log instead of exception" into sc-dev am: d5419b7fb5 am: 641b3e7ff5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ieb31c50f284602afff5ede2c06619c5db2fc3b33