Merge "Add onPayloadFinished callback" am: 22fef7b3e4 am: 668622d6c5

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

Change-Id: I69fc6a4dcf1d8e72bd268f8de91a8bc36f880713