Merge "Annotate some TODOs" am: 302d29eb9b

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

Change-Id: I44b41e53bf2057d1413a49e691c04e8e32912868