[automerger skipped] Merge "DevicePolicyManager: ignore invalid proxy...

[automerger skipped] Merge "DevicePolicyManager: ignore invalid proxy settings" into tm-dev am: e4d17b17 am: ae2e3b7e am: d5085195 am: 67969b1e am: d1bc8525 am: 80df81bf -s ours

am skip reason: Merged-In I496b9ce7a0bbb1e6c245682be57b7357bb432d42 with SHA-1 2ea32931 is already in history

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



Change-Id: I5e2cc826f97858d465ba3da493f7bd4a131e3c1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>