Merge "Remove useless code" am: 646cf23c3c

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

Change-Id: Id5c6ab919f223fd4da2838c477d7f5665066917c