Merge "Baseline one more Lint FlaggedApi violation" into main