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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12f34f8ab58ccdb135fff6451ba2a948ab660ad7