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

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



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