Merge "Remove a useless method" am: 3edc1b50bf am: 77b171be6f am: 107dd4f936

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

Change-Id: I0d32f54bf0c10afa33d59292291806a482af159c