tree ce25744346501ff6a9bd124576529af3384d462c
parent ee9a99a6a83e7a66645185fe3b159b63b966a312
parent a538ffe2a4b94aa9ddbed4cecc8d2d1d52663bfe
author Alex Johnston <acjohnston@google.com> 1617885970 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617885970 +0000

resolve merge conflicts of 8786016e859c639de1d3722c1911b5389ef8fc39 to rvc-qpr-dev am: a538ffe2a4

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

Change-Id: I31f76112edeb770bc3b9c017f6205392dbe3f5a8