Merge "Change Rounded corner overlay to be in Overlay layer" into tm-qpr-dev am: 38f58fb7

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



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