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

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

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