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

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

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



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