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

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

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