Merge "Delete dead code which had adverse performance impact." into sc-dev am: 82a1baf8 am: 0bf29bd3 am: ffa531ee

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

Change-Id: Ifd80f1e8d0ab6a2161b87b3d0399ccf992cb8f16