[automerger skipped] Merge Android R am: 7f4c14cc88 -s ours am: db2a369101 -s ours am: decf1c94c4 -s ours

am skip reason: Change-Id I8a6a13dc1fdd09f3851cbdee0bbb4165247b3735 with SHA-1 e67e65b47a is in history

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

Change-Id: I97908934a8ae59646d7841773c586c16503f2ee4