Merge "Pass in dbFile from idpGridState for grid migration" into tm-dev am: deae9343be am: 2b8e4e6cfb

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

Change-Id: I158ed4d3948ca11190344bf943b89bd2a196fa9a