tree 25bb79669163856495f9c92f5d127c2a7451bda3
parent 067634700688a18a705de531f451bd1a5d92fa88
parent f646e05587b617a5a3f76c0cdc3d6dd3f49444bb
author Santiago Etchebehere <santie@google.com> 1600980260 -0700
committer Santiago Etchebehere <santie@google.com> 1600980260 -0700

Merging from ub-launcher3-rvc-qpr-dev @ build 6861538

Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-rvc-qpr-dev_rvc-qpr-dev_6861538.html

Change-Id: I743cfd1a726d223ed6e1e5c0cfb9dc64a9d0c306