[automerger skipped] Enable live tile in 3 button mode am: 1fe5fda3d8 -s ours am: 3022d5f9f3 -s ours

am skip reason: Merged-In Iffaea18afb2179b5bb7dadda49e56efefa5658bc with SHA-1 d09ebe660f is already in history

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

Change-Id: Idb3827453ad55161f210b919dc1f89dd30826d1b