[automerger skipped] Merge "Don't fail if TAG_ALLOW_WHILE_ON_BODY is missing"...

[automerger skipped] Merge "Don't fail if TAG_ALLOW_WHILE_ON_BODY is missing" am: 2a590dcb am: 1f9d9e18 -s ours am: a96a9250 -s ours am: b6c93114 -s ours

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

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

Change-Id: I79aed6911709a1a47e6c21ea94b38e623ccb1429