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