[automerger skipped] [DO NOT MERGE] Handle IllegalStateException in APM event handling. am: 60a456a0 am: ea582ced -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2d072d54b17e65c55c1723d79a11f00f8c78e358