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

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

Change-Id: Icb0c64d11ad38f1a554acbaf9dca7931bfe55db8