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

Merge "Revert change "Change Rounded corner overlay to be in Overlay layer" Revert CL ag/18494304" into tm-qpr-dev am: f272870a

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



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