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: I37f3a6b5e3e7cd697bf7d8812bd83675534d4108