Merge "Revert^2 "Baseline one more Lint FlaggedApi violation"" into main am: ff16433402 am: 07dfffcb75

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

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