Merge "Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am: 48ed8aa4 am: 76136dcf" into oc-mr1-dev-plus-aosp