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: I8842d2144d3d08b5ac4213c98dfe5bd7ae1e1f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>