[automerger skipped] Merge "Merge "Change Rounded corner overlay to be in...

[automerger skipped] Merge "Merge "Change Rounded corner overlay to be in Overlay layer" into tm-dev am: 2c048102 am: e7dd7f25" into tm-d1-dev-plus-aosp am: f2085132 -s ours

am skip reason: Merged-In I7bf2380edbb8267347a8ded53b0755524f6781f5 with SHA-1 95ad5b53 is already in history

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



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