Merge "Merge "Fix folder app icon truncation after rotating to landscape." into tm-dev am: af8b7d33 am: e0770eb4" into tm-d1-dev-plus-aosp am: 72074703

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



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