[automerger skipped] Merge "Use formal API for ActivityThread to set proxy"...

[automerger skipped] Merge "Use formal API for ActivityThread to set proxy" am: 394170f9 am: b70ef11f am: 8a1fc93c -s ours am: 09faec96 -s ours

am skip reason: Change-Id Ifb516194ecde1567cea4b6806946091cdcf2f015 with SHA-1 a26ffd97 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97e9e9e8564fba14dfc16a92e4c852ad9d318f96