[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: 6fb54380 -s ours

am skip reason: Merged-In Ifb516194ecde1567cea4b6806946091cdcf2f015 with SHA-1 a26ffd97 is already in history

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

Change-Id: Ic7b534e0c424b7a5a6df4ec21e95b575ecfc890a