tree c29029df798578c5002ff1034ff53536036e4bc2
parent 4c04982fd65e3176d24113958bf4e41d1ffa3d4c
parent 839d0d712c98a45c12a921a0f5008354434d484b
author Matt Casey <mrcasey@google.com> 1586220865 +0000
committer Matt Casey <mrcasey@google.com> 1586220865 +0000

Merging from ub-launcher3-master @ build 6369897

Test: manual, presubmit on the source branch
Bug:150504032

x20/teams/android-launcher/merge/ub-launcher3-master_6369897.html

Change-Id: Id94544cf790a7dcf0841f66648ac864bf2f530d4