[automerger skipped] Merge "Don't fail if TAG_ALLOW_WHILE_ON_BODY is missing" am: 2a590dcb65 am: 1f9d9e187b -s ours

am skip reason: Merged-In I2e80ca59151e79f595a65cae94ac966b4ba7020d with SHA-1 3dbdaa9717 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1764906

Change-Id: I180746a49d543b6c630f7b21b48b31f3b4bbf7f1