Merge "Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners...
Merge "Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am: 48ed8aa4 am: e64d0028" into oc-mr1-dev-plus-aosp
am: eee9fe30
Change-Id: Ibacf967f6dbf5a03752186e0a4c8750cabf15cae