Merge "Add "product_available" to product available modules" am: 007228773d am: 02f12b3567 am: 98a24f2da7 am: d89037ddbd

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

Change-Id: Icfbe10bc32397c6498e84838dcbb963a44cfb2cd