[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: 641b3e7f -s ours am: 064f0b01 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iea559e35ef6b6bda42160599588398d60ce7668b