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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idaa0a7ee3c618566fc4dfa971f7d2aae41b158a0