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

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

Change-Id: I393d877a71fe3a42dcb154f7f58ff054c8131a6c