Merge "Adding comments and removes unnecessary parameter" into tm-qpr-dev am: 36f670f6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19647134



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