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

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

Change-Id: I928acafa348c482aafbd7d0941f9395ff02b42e0