Merge "6/ Removing unused code from previous cleanup" into tm-qpr-dev am: f1318aa3 am: a77719c1

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



Change-Id: Ia136a35fd5a797dd113f166c97b9baa4e9ebe9c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>