Merge "Fix screen rounded corner flicker." into tm-dev am: 8073fc8daf am: 276a31bbf8

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

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