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: 02ef2ce3 am: b12f4c6b

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

Change-Id: I9582da0940fedc908cd718f7a4813156f7149208