[automerger skipped] Merge "Remove unused paramater to finish" into...

[automerger skipped] Merge "Remove unused paramater to finish" into udc-qpr-dev am: 336c012b am: a508c09d -s ours

am skip reason: Merged-In I27da152c8c9ec7be1ac22a236ceface4e5d497b9 with SHA-1 bc0efbdc is already in history

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



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