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

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

Change-Id: I07e79c417528a08896ce07213e5476d771de545c