Merge "Shift RoundedCornerOverlay to Display window hierarchy" into tm-dev am: b5863e8d am: 3aa84941 am: fb1c7116

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



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