Merge "Remove unused interface and implementation" into sc-dev am: cc057784...

Merge "Remove unused interface and implementation" into sc-dev am: cc057784 am: 7ef3410e am: 243a31e5

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

Change-Id: Id8f71cffc4d665e77a93f5e216f9e4d608d4a7a2