tree 91931cbf6a40a773f3c98512b562bd220ec1edd5
parent 25a97f5655a0780a7416c22d91e194c9bdece93e
parent 745aff429479e4760a931726e87f74f50f60f67b
author Adam Cohen <adamcohen@google.com> 1579654990 -0500
committer Adam Cohen <adamcohen@google.com> 1579655438 +0000

Merging from ub-launcher3-master @ build 6150369

Test: manual, presubmit on the source branch
http://x20/teams/android-launcher/merge/ub-launcher3-master_6150369.html

Change-Id: Ia79497c0a9f03cf6ad9e9daa58ed34c02a36e879