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

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

Change-Id: I8cfd3fc1e3287ec2cef799d008dc5bcbcc1881a9