[automerger skipped] Merge Android 14 QPR3 to AOSP main am: b7c2c40568 -s ours

am skip reason: Merged-In Ib4445575b34ba410c5a362cc40cf3fb26ec8a64b with SHA-1 998fca5216 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termtree/+/3132394

Change-Id: I632dfbdb244f8d3ad263f37b9308ee5ee87e9d2b
Signed-off-by: Automerger Merge Worker <[email protected]>