[automerger skipped] Merge "Merge Android R" am: 81cfc612a8 -s ours

am skip reason: Change-Id I4c367c09b9cbf00d8e1100130ad3d80c0cb2562f with SHA-1 3045de1292 is in history

Original change: https://android-review.googlesource.com/c/platform/external/chromium-libpac/+/1422304

Change-Id: I09215b067e4a90ddb3202867fdff23908e875cc0