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 am: e129994b

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



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