Merge "Add onPayloadFinished callback" am: 22fef7b3e4

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/1814237

Change-Id: I39b07f2892f2745790bade1f38b8ecfecaa26bca