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

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

Change-Id: Ib3e7dbefdb78b3ad9c7b00766d563c7877f823ac