tree aefee0dc04840530e62d3dbd3c339d161f12e26d
parent 5e74cd7b069f166ceec5e71f419faf46b511b165
parent 087e879b2541e8e65cce1dce236656c4969c5cd0
author Brian Isganitis <brianji@google.com> 1646331238 +0000
committer Brian Isganitis <brianji@google.com> 1646331706 +0000

[conflict] Merge changes from topic "presubmit-am-4c8411152aef49f099eee419e063b01e" into sc-v2-dev-plus-aosp am: 087e879b25

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

Change-Id: I46336888da6b90649c6def8fbc10c8032f4f2821