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

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

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