Merge "Ignore IllegalStateException" into main am: 509f604afe

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

Change-Id: I473ced15a778bf6700f549d156f38d9fe8308d18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>