[automerger skipped] Annotate some TODOs am: 12ee2832 am: 7d8a0107 -s ours...

[automerger skipped] Annotate some TODOs am: 12ee2832 am: 7d8a0107 -s ours am: 3f65cde8 -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: Ieb6d9a1c72042212a3010094a9ada7b57b74f7cd