[automerger skipped] Merge Android 12 am: 091917e0fa -s ours am: b8ff2a6d58 -s ours am: 8e5044149f -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: If539243592ebe30b3de3998bca3e4f4a83a6b94a
tree: b0b928a9c8b07371c67f14c5fb00d6b25fe9166b
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. NOTICE