Merge "Annotate some TODOs" am: 302d29eb9b am: 0185ac7270 am: 3c8c7cdfa2 am: 6f381fc935

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

Change-Id: I17acb8f57eb2443169d3565d23e58fd61c216fdf