Merge "Remove unused paramater to finish" into udc-qpr-dev am: 336c012b

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



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