Merge android10-qpr3-release to aosp-master - DO NOT MERGE am: f673dac541

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

Change-Id: Ib1249d92a8d23e4a1857d963eb8986059274563f