Merge "Add "product_available" to product available modules" am: 007228773d

Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1495759

Change-Id: Ia66494897e281939bcc69347370bcf075e4fc952