[automerger skipped] Annotate some TODOs am: 12ee28322d am: a468daf38d -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: Ic6c64c70523b00fc81eb0caacb1236c8eadc112a