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

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

Change-Id: I337f5da9e2883fa5ec19f97b8b386a03d09cdde3