Merge "Change Rounded corner overlay to be in Overlay layer" into tm-dev am: 2c048102

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



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