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

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

Change-Id: Iff05976d83e8465e1e9fe3d3f4f9fc5bbcfba35f