[automerger skipped] Merge Android R am: 167178355a -s ours am: 0a8592eed4 -s ours am: 6a97a147ec -s ours am: 05b1ba4948 -s ours am: 24915a7a53 -s ours

am skip reason: Change-Id Ia1df46118f3467b12bd0fcb06dbb32772d95720b with SHA-1 5cf51c59c8 is in history

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

Change-Id: I45d40589105d1f9e4140ea371066e6af9b450d3b