Merge "Remove redundant calls and correct some comments." into main am:...

Merge "Remove redundant calls and correct some comments." into main am: 21fc3f3b am: cb7b8039 am: a4cae586

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2829551



Change-Id: I9dfceebb1f117b9d4b05adcac0f29ab214e60e0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>