[automerger skipped] Merge Android 12L am: efcb29dd15 -s ours am: 1eb8a8f7ee -s ours am: 674c9daa13 -s ours

am skip reason: Merged-In I8e281e376b53973c22b137aa7bb33085a9b5db7f with SHA-1 3b80925a06 is already in history

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

Change-Id: I45d12abdc1c757ba406537e9f16e1282f5874cbc
tree: 9ee9637ede2e655199bd6613c523745fea99c5b7
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. CleanSpec.mk