tree 032798e475ff70e25f68b30a2f4d1fe5032fe926
parent 87fbc2e02ee06e4f75d87fe95f0f21199987b1e0
author Sebastian Franco <fransebas@google.com> 1709576901 -0600
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> 1713802513 +0000

In the case the gird migration goes to a taller grid keep the grid configuration

For example going from 4x5 to 4x6 it will keep the 4x5 configuration
which fits in the 4x6 grid.

Also, it fixes GridMigrationTest which was flaky because of
how it sorted arrays.

Bug: 325286145
Flag: ACONFIG grid_migration_fix disabled
Test: NA
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2eaf15c37a051fd17c18c4443a8bd19d39057bf0)
Merged-In: I6063e3c303320096f7429a3b1d909e107d2ef2a0
Change-Id: I6063e3c303320096f7429a3b1d909e107d2ef2a0