[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: 5c5ede24 am: c35f439d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8fed0231436e28f2f643b7d22a45507b382a0320