Merge "Make native_headers product_available" into main am: 84c4614f8b am: f38c31ca9f

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3343377

Change-Id: I70be013be9f727d56f602b8bc37648cb50f614ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>