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: 80b28028

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

Change-Id: Ic5be62fb1e132ab060c52d57b3b0ddb2bd51a157