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

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

Change-Id: I3bc380617c221a0fe3677733802bcd9145faee2d