[automerger skipped] Merge "Make sure the PAC script content is sent again" into sc-dev am: 10cbb66f -s ours am: 58e58355 -s ours

am skip reason: Merged-In Ic76428f42f37f8552a526190764ad32e2874adb0 with SHA-1 eb9d9b26 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14547067

Change-Id: Iccefd60b995fad4b551be63678d93f31b18cecec