Merge "Add product_available to VNDK snapshots" am: 7e8fcca44e

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

Change-Id: I58a0872da89462288ca0ddd861e3092fe311ce98