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