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

Change-Id: Ibee1aea584f3e4141806aad6c8e7a592ccc31503