Merge "Implement more features to vendor snapshot script" am: 4681e0372a

Original change: https://android-review.googlesource.com/c/platform/development/+/1398757

Change-Id: Ic9bab84d0a2a54f2e6630e28bd2389558a4001e0