Merge "Remove the unused parameters" into main am: 3f7cafba am: 5342b256

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



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