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

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

Change-Id: Ibfa45a323c9058197399bc6d041ea8652762c957