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

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

Change-Id: I82c4a74e47d2fc711a669c1574fb645ed2ba5ef1