Merge "Fix failed test in order to enable Live Tile (in the next change)" into sc-dev am: 78f5a8c6ab

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

Change-Id: Ia16d2ec0aed14238887541a9d4033795b3006afb