[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: e67e65b47a -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: I6a5eb20139f558d70ff5c5ccdd5e32f8f5cb3c56