Merge "Remove the unused parameters" into main am: 3f7cafba am: 16c32895 am: cda30b28

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



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