Merge "Add product_available to product available modules" am: a9e6057dad

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1496003

Change-Id: I2643b1b482397a31971cc992e3ae450fb19d9797