Merge "Remove useless code" am: 646cf23c3c am: 53a2ffe768

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

Change-Id: Ic92c5094ec5e593f8a8400d4001d1eb8e54e85e2