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: I25e72b58cc6c90b8c7bc8edb0b4fc738938dd32b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>