Merge "Remove old code that isn't relevant anymore." am: 22e3e74e4b am: 0642fc19f3 am: dd85ce6a50 am: 11f4874360

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

Change-Id: I73da8e316b2b740ea2d0ecf8f8bb062a64ff6978