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

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

Change-Id: I4a6c30f7bfb1e047449f83ae6f90cd596f11d62c