[automerger skipped] Merge "[RESTRICT AUTOMERGE] Workaround to dump error log...

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

am skip reason: subject contains skip directive

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

Change-Id: I228a6b2a1a0a00d376fdc67f2b6227692bc9ad90