Merge "Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am: 48ed8aa4d0 am: e64d0028ae" into oc-mr1-dev-plus-aosp
am: eee9fe304c

Change-Id: Ibacf967f6dbf5a03752186e0a4c8750cabf15cae