[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 5cf51c59c8 -s ours am: b2614f63bd -s ours am: 5c5f90d70f -s ours am: 868b298db7 -s ours

am skip reason: Change-Id I008744c30f7e6b8fb8771fe88ff9105ede5bc444 with SHA-1 7381f818ba is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libchrome/+/12470000

Change-Id: I72c0cd7b88977167a5f83d446cece26a44388d00