Merge "Pass reference to finishKey" into udc-dev am: f2fcbc8ed2 am: 8d66e8e86c

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

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