Merge "Only check dbFile to decide if grid migration is needed" into...

Merge "Only check dbFile to decide if grid migration is needed" into tm-qpr-dev am: bd8111a0 am: ea4cd212

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



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