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