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

Change-Id: Ib87b081ec02bfa030d0561cf12beac9d4b8ca692