Merge "Remove code that seems unneccessary & has a leak" into rvc-dev am:...

Merge "Remove code that seems unneccessary & has a leak" into rvc-dev am: b74c1ad2 am: 2260ab02 am: ae535f7a

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

Change-Id: I1b2c3b48e4b7d95459886f5878e1f0f835ededac