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

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

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

Change-Id: I17a2c0421b53c9183ff7c5de4f332130d2e5cfa7