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

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

Change-Id: Ibbdc228c124a59d066581a1ba211dcdf1cda89c5