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

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

Change-Id: I5640647c625cd2cc7a93b70970bb267bec7e5f3b