Merge "Don't fail if TAG_ALLOW_WHILE_ON_BODY is missing" into sc-dev am: eca569897a am: 200b2ba4a7

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

Change-Id: Ie5cdb99fb756f70dfa1ea87f66756f2440c3d333