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

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

Change-Id: I23f12ebe575c6cb97684d25f195d305a4cb5aca0