[automerger skipped] Merge Android R am: e74672036d -s ours

am skip reason: Change-Id Idfe5b27aaac2ad35cb2626afaf7d9ca5dca4ef4d with SHA-1 d4c03cbfc0 is in history

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

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