Merge "Fix screen rounded corner flicker." into tm-dev am: 8073fc8d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17948370



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