tree bd08f5e083bff0c4ffc5cd67a8e74f83c9717943
parent d1f865b138438e9c3dd1b0dd278ef51b33c513aa
parent bed0008d77220a3acf817e3548b84c6a031f35d8
author Hyunyoung Song <hyunyoungs@google.com> 1587283282 -0700
committer Hyunyoung Song <hyunyoungs@google.com> 1587283282 -0700

Merging from ub-launcher3-master @ build 6408463

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

Change-Id: I94008fb8291d8db6126b36ff45aa15ca8ffa8c2f