Merge "Explicitly expose native_headers" into main am: 30d8100103 am: 6c3dcb2af9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3342146

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