[automerger skipped] Merge changes from topic "nativewindow-rust" into main...

[automerger skipped] Merge changes from topic "nativewindow-rust" into main am: 5d6006d8 am: 6c3e2f72 am: a0b0fd7b am: 31627ebf am: dd8078bf -s ours

am skip reason: Merged-In Iaf916fabe49190f47abd1a9ed34afdb76fd20e40 with SHA-1 4ab0fdc9 is already in history

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



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