Merge "Remove redundent call." am: 491328c9e3 am: 793bb37c19

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

Change-Id: Ib66932f8799d53b36349029e8cf6dd2a31d99c75