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

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

Change-Id: I78b83461a4899bc8938f5396e44e125db68c0490