Merge "Fixes for NDK API Review feedback" into main am: 907220e655 am: 9c1186f39a

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

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