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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe8e9077570db1715c11dce3fbbc2d935d6eb781