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: I572b20fe66b9dcc21229039a348003bdb05f1d27