tree e74b294c1ec8e592925f407032ad1f3a2f0f3c6a
parent d169422c464a118094f0df6428e5f8408ec389ca
parent 6b1dfed0d4b00bcf4cfee968fb6ed919dd8c0cf8
author Matt Casey <mrcasey@google.com> 1586220225 +0000
committer Matt Casey <mrcasey@google.com> 1586220225 +0000

Merging from ub-launcher3-master @ build 6369897

Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-master_rvc-dev_6369897.html

Change-Id: I5e62a4b492bc01dfa0c03b004f044de8593970b2