Merge "Suppress lint for methods using APIs promoted from system to public" am: 5ca3af0dc4 am: 4f53b4b562

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

Change-Id: I7c38b6550369387bd9ec7287f20c2a34760bc4f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>