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