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

Merge "Remove redundant calls and correct some comments." into main am: 21fc3f3b am: 6ed1c08a am: b494649d

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



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