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

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

Change-Id: I1e0f90254796b2e9133a9c75e41c2ca08e7c02b6