Merge "Move tag type comments where they belong." am: dd9d98c339

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00227cd2c0119c8f290d71eec04931b9d77895e5