Merge "CEC: Drop TODOs marked as fixed/obsolete" am: 6e7f16ac1e am: 59cb50e06a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676434

Change-Id: I88c22d703fdf77f59a480017060c50f7ed19e50b