[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to...

[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 29898a1f -s ours

am skip reason: Merged-In I6632cd79949931740dec0ee913efc32a7849644c with SHA-1 b96cfee4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/27273912



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