Merge "Fix issue with camera overlapping split staging UI" into tm-dev am: db92b5d73f am: e14b8a593a

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

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