Merge "CEC: Drop TODOs marked as fixed/obsolete" am: 44ab24bb22 am: 0efa9c5f25 am: 3c30d79513

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

Change-Id: Idcae2ea15fdc931a17220ff67d294d415de2a4e7