[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 8d94ad4572 -s ours am: 3029d6fd44 -s ours

am skip reason: Change-Id I1c74f64fcbbcbf82bd84b08c8f52dd24feb2c8a9 with SHA-1 1d007476ea is in history

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

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