Merge "Merge "Set the resource values of cutout path and rect to empty string...
Merge "Merge "Set the resource values of cutout path and rect to empty string in waterfall overlay" into rvc-dev am: 6c654013 am: bfd91980" into rvc-d1-dev-plus-aosp am: 82b8dac4
Change-Id: Ia0cbf1f8946faf4a9ec97966ee24be78d483aba4