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

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



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