Merge "Annotate some TODOs" am: 302d29eb9b am: 0185ac7270

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

Change-Id: Iec657494ec02a6eb8f9697161798e0fde206100e