Merge "Merge \\"Add missing roundOut for layer damage\\" into nyc-dev am: 48cde353eb am: 11858f170a" into nyc-mr1-dev-plus-aosp