Merge "Improve doc for CSM#setGlobalProxy" am: b92d8ccd39

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

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