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

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

Change-Id: Id0556061841a1a1d4917840b61c701a1c854973c