Merge "Don't rely on default argument of NDK API." into main am: 9bfd564372 am: 19235693d8

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

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