[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 am: 6a94b19f -s ours am: a31dcfd1 -s ours

am skip reason: Merged-In Iddc0f36739ec1579e31edec314e9509c3c70edfb with SHA-1 6af81a2b is already in history

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



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