Merge "Merge "Shift RoundedCornerOverlay to Display window hierarchy" into tm-dev am: b5863e8d am: 81607ac6" into tm-d1-dev-plus-aosp am: 909ffe78

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



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