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

am skip reason: subject contains skip directive

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

Change-Id: Ie6a81639e65c5d540b31bd1046013eb7188fe046