tree d849753f2e55d5890444d6b81e47e69b55949c2a
parent e69176effda2540fb32e4f27edfb85e659a98d7e
parent ea582ced9da83d29716fe1d1b35466d5200e3ef2
author Joy Babafemi <jbabs@google.com> 1641586894 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641586894 +0000

[automerger skipped] [DO NOT MERGE] Handle IllegalStateException in APM event handling. am: 60a456a0a6 am: ea582ced9d -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