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

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

Change-Id: Id4190510aa941f12497f27dfb95f5c54554aa263