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

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

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