Merge "Add @SupressLint to get around incorrect warning." am: 38872800dd

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

Change-Id: I2a2f048a3310bbf04b48909b8518fe019633bcf7