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

am skip reason: subject contains skip directive

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

Change-Id: I13670e62b0796e77648eb9eb890e38da3c2429d7