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

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

Change-Id: I8869ebfa06b32147d4feb5265abcba2f448165c4