Merge "Add test for setHttpProxyConfiguration" am: bccd97f0b3

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1564956

Change-Id: I4202c49b98ecf7b6b8fb222f7f57b27e6b779288