Merge "Fix 22848: Lint: Bogus suggestion and fix for flattening layout"