Merge "Prevent doubling up on split placeholder insets" into tm-qpr-dev am:...

Merge "Prevent doubling up on split placeholder insets" into tm-qpr-dev am: 8edca84c am: 0c1d05a6

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



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