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

Change-Id: I3030c64c30f6c16dc9c8a01e21a5dc6b58cbd273