[automerger skipped] Revert change "Change Rounded corner overlay to be in...

[automerger skipped] Revert change "Change Rounded corner overlay to be in Overlay layer" am: 6af81a2b -s ours am: 60988049 -s ours

am skip reason: Merged-In Iddc0f36739ec1579e31edec314e9509c3c70edfb with SHA-1 4f02f437 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19229662



Change-Id: I88547a892daa3a74d5c152e3e1f1bfb067421240
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>