tree 2aa10c2fad6ebe1959fdb360047cf02a17963f86
parent e19a23a7ff6ab4a48ca814f45b3477fb070f22de
parent ba1a2b9b62774542dfe34d8baf222f0358ce29ef
author vadimt <vadimt@google.com> 1585077475 -0700
committer Winson Chung <winsonc@google.com> 1585116406 +0000

Merging from ub-launcher3-master @ build 6327709

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

Change-Id: I0a135e14daf3671648f02999da13d323efb5fe81