Merge "Remove the unused parameters" into main am: 3f7cafbaa1

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

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