[automerger skipped] Merge "Add @SupressLint to get around incorrect warning." am: 38872800dd am: afbb33724b -s ours

am skip reason: Merged-In Id297e739a2288ccc232c6b989ec7fee41837a910 with SHA-1 13f5d37e48 is already in history

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

Change-Id: I8c40ad74f71e1a5e7fedd2d0847286520e8e89b1