[automerger skipped] Merge Android R am: 7f4c14cc88 -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: I0450d3c5187b25fd34ea593cfb160173b16eeb35
tree: 6b63a0c462516c8c7ad109d090ea5c5197101ccc
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS