[automerger skipped] [DO NOT MERGE] Handle IllegalStateException in APM event handling. am: 7bde0926f7 -s ours am: 9bfbf3294e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16141748 Change-Id: Iba4efcd47d2a44cddae8eee5ebfc399f93e74c3d
This commit is contained in: