Merge "Merge cherrypicks of ['android-review.googlesource.com/3452706', 'android-review.googlesource.com/3452707'] into ndk-r28-release." into ndk-r28-release