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

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

Change-Id: Ia4e2a821f7135ad04d482891936b33f92f5b83cb