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

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

Change-Id: Iea9568c8f0a45861101cc3413889fa98eac5c672