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: I98793887a0e61098a0f066f5267ca7c89ca4120e