tree ab11591d4b8536cade594705b28a2c8b899f98a5
parent 368b18ee65c7895c2b85df7242fecf4b7f2febd9
parent fb65043bca39d2bdb67ef3e22f673e59ab9ad564
author Bill Yi <byi@google.com> 1635963946 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1635963946 +0000

[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 6fcd0f86c5 -s ours am: fb65043bca -s ours

am skip reason: Merged-In Id6156b3469ffc23b171415d792cf48c9db9634c2 with SHA-1 526386b255 is already in history

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

Change-Id: I74989ad40a61eab284c33a295f8ef372680d0131