[automerger skipped] Merge "Add @SupressLint to get around incorrect warning." am: 38872800dd am: c10e7b540c am: 451f04d1a6 am: 94eee2743a -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: I9cbb5fc95562decc0aed90219dcb7d8219e0cf1a