Merge "Remove code that seems unneccessary & has a leak" into rvc-dev am: b74c1ad2 am: 003dd2bd am: 61b8ed89

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

Change-Id: Ifbaf7636c5ce3efac95e94d0ef3aa5ccd84886d6