Snap for 8589293 from 177e7c335394e5caebd2b6aa8f4c7e376545f5e8 to sc-v2-platform-release am: 16216f3643

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

Change-Id: Ie120ba7704493660d4928435d54e42cfa14b2698
Signed-off-by: Automerger Merge Worker <[email protected]>