Merge "CEC: Drop obsolete method" am: a1f337fe73 am: 9b85cbe8c9

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

Change-Id: Ibd490bf35c8cd9b4ed69ceb3e6a25d20f321e0ca