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

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

Change-Id: I4c5a9f7427f28642d0ca82aa0b22eb02a58aa880