Merge "Update folder row and column for 5x5 grid to 4x4. Update dump method to...

Merge "Update folder row and column for 5x5 grid to 4x4. Update dump method to include changed properties and add dump test for 5x5 grid" into tm-qpr-dev am: a695986d

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



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