Merge "Remove unused interface and implementation" into sc-dev am: cc057784 am: a6f563f8 am: 2dc8ee2f

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

Change-Id: Ib6c6ae8b948a4d3680a9a107350f404d9de5e400