[automerger skipped] Annotate some TODOs am: 12ee28322d -s ours am: 035e294739 -s ours

am skip reason: Merged-In I80ccaedeb777fdb249a8cb021db6628da32d6029 with SHA-1 7c046786b8 is already in history

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

Change-Id: I4c575e4f4fb97e876e54124bebb4728b7a744b70