Merge "Avoid unavailable APIs in ShellUtil" into main am: 137f2d754c

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

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