[automerger skipped] Merge android10-qpr3-release to aosp-master - DO NOT MERGE am: f673dac541 am: ebe4d6f311 -s ours am: a165521eb4

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

Change-Id: I7c88c8a80236261ab9541668bcdea353f884f04e