Merge "Remove a useless method" am: 3edc1b50 am: 77b171be am: 107dd4f9...

Merge "Remove a useless method" am: 3edc1b50 am: 77b171be am: 107dd4f9 am: dce36b5b am: 3aa0a27c

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

Change-Id: I758219ce4f2484b35d046842068fc54f37f62ef8