Merge "Add test for setHttpProxyConfiguration" am: bccd97f0b3 am: 9627dd29b5

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

Change-Id: I6ca0bdecaf5c72847b5569fd4f6ff10abfc0cba4