Merge changes I2cc102d7,Ifba9aa59 into sc-v2-dev am: 54ce7e6cf8

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

Change-Id: I9de621c74f2a47f893d309031ea61e0b25763fcf