[automerger skipped] Merge Android 13 QPR2 am: 2d6ada7f40 -s ours am: bcf17e9ff2 -s ours am: 922e950b48 -s ours am: e6b742b1cb -s ours

am skip reason: Merged-In Ibc337e4459d8db789f0b2102b71a8b2e1ed2589f with SHA-1 bdb0b8d3fa is already in history

Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2487155

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