[automerger skipped] Merge Android 12 am: 091917e0fa -s ours am: b8ff2a6d58 -s ours

am skip reason: Merged-In I9485983135ab1e4b8bbb75e9ede620afd7b5a605 with SHA-1 a6741bc34d is already in history

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

Change-Id: I71693e2dfbc33fa7d16f4c9b8f880ae3e2620cb6