Merge "Improve doc for CSM#setGlobalProxy" am: b92d8ccd39 am: 4602fea1d7 am: a93c6bc35b

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

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