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