[automerger skipped] Don't fail on TAG_ALLOW_WHILE_ON_BODY am: 88baa7828b am: 8527f6fc24 -s ours

am skip reason: Merged-In I9f785579e38dbbc45e1e4f993a991ff38b59b6cd with SHA-1 f640f5c65a is already in history

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1764925

Change-Id: I41b292784bffcf94a9b6d2087c12f2dd52025005