Revert change "Change Rounded corner overlay to be in Overlay layer"

Revert CL ag/18494304

Reason: Memory regression on certain devices (b/235601833)
Bug: 235601833
Bug: 225505986
Test: manual
Change-Id: Iddc0f36739ec1579e31edec314e9509c3c70edfb
(cherry picked from commit f62e0013)