[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a6741bc34d -s ours

am skip reason: Merged-In Ib71ec848048d4a921b0086d3432797c885ac98ed with SHA-1 4cb2352056 is already in history

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

Change-Id: I5e9a4945a968320e964127bab6791e51745a82e9
tree: b0b928a9c8b07371c67f14c5fb00d6b25fe9166b
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. NOTICE