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