[automerger skipped] Annotate some TODOs am: 12ee2832 -s ours am: 035e2947...

[automerger skipped] Annotate some TODOs am: 12ee2832 -s ours am: 035e2947 -s ours am: 74c3d5c8 -s ours

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

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

Change-Id: I2f9a29d4e1a61ba5359719e3eea58d86f88e6619