Merge "Fix responsive folders" into udc-qpr-dev am: 735b18ba4c am: da6e58c859

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

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