Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am: 48ed8aa4d0
am: 76136dcf45

Change-Id: I396e7552fd7c0a5c10e26c895c68bb54ca551f6b