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

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

Change-Id: I24acf8ebf0263d6b2a0118b80e0998c9beeb80e1