[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 05e0dbe788 -s ours am: 1ef8d7d126 -s ours

am skip reason: Merged-In Ie8571e883132cfaa5a054cdcf4c3a827fa215014 with SHA-1 a8107bf82c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/3258126

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