tree 030c90c104fb1c60e72c75d2b41a5477e3d7c25b
parent 30133051d7464c90204657f9feced09544393e2c
parent e908dbba29627d48067789d5872d7e06961eb19a
author Alina Zaidi <alinazaidi@google.com> 1623359795 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623359795 +0000

Merge changes I5d1c9e4b,I08154c94 into sc-dev am: 1fbf9200f1 am: e908dbba29

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

Change-Id: Icc45b99bc5daac07ab781ec794748218b3ab9087