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

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

Change-Id: I6d57a546289351864e85f20572242e25b4af57f6