[automerger skipped] [RESTRICT AUTOMERGE] Workaround to dump error log instead of exception am: f8fc1326 am: bb77ce0e am: ea50dfc3 -s ours am: da223239 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib391ee05df703a67393cb8b0fb9a50138ddc3a0a