Merge "Merge "Remove code that seems unneccessary & has a leak" into rvc-dev...

Merge "Merge "Remove code that seems unneccessary & has a leak" into rvc-dev am: b74c1ad2 am: 2260ab02 am: 80b28028" into rvc-qpr-dev-plus-aosp am: 11355ea3

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

Change-Id: I550950b1485f27c3d6509a5c561334e2c86e8c69