Merge "Delete dead code which had adverse performance impact." into sc-dev am: 82a1baf8 am: 02ef2ce3

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

Change-Id: I17cbc7f95c8e4177be16ba0b3f83be871dcbe80b