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