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

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1535666

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04101f35470f89b17d35f6d5974650798169fd63