[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 3b80925a06 -s ours am: e5854173b9 -s ours

am skip reason: Merged-In I900e4748546ee47f80f840fb7d9ec2860c1e4e91 with SHA-1 53163d66c9 is already in history

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

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