[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: e67e65b47a -s ours am: 32d4e3882f -s ours am: 9517fd3634 -s ours

am skip reason: Change-Id I0270484ab34bb53a0d85951b0621e0c8b552b8be with SHA-1 0506b68a4f is in history

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

Change-Id: If933b69d1cec082dbf948b2db79d43bdc253dab3
tree: 6b63a0c462516c8c7ad109d090ea5c5197101ccc
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS