tree 4c814f44a0cacdd890d4ac1b8e5ba26860d9c2d9
parent 5bee1f934b5491202985eecbad74cdc2c941ee15
parent 9ed7515314b983cde74b67dd2417261b5c3a4067
author Zak Cohen <zakcohen@google.com> 1584489350 -0700
committer Zak Cohen <zakcohen@google.com> 1584489350 -0700

Merging from ub-launcher3-master @ build 6304996

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

Change-Id: I6ddd8ff2c3643b5682ce108921d30febdd7f72d2