Merge "Remove unused vintf_object_recovery_test.sh" am: 23501ea218 am: 720d2fa214

Original change: https://android-review.googlesource.com/c/platform/system/libvintf/+/1906173

Change-Id: I1b03eb5464c5d7ddac65838f2fa9e5dc2b965669