tree db754dfc0c2f034a5e259f2eed59c598c64dee38
parent 1eedfc33c52cea1d37ae4948737f9d773f87779b
parent 6bf6848951666ed1f5d4779f62ef98643aabb351
author Joshua Trask <joshtrask@google.com> 1589987574 -0400
committer Joshua Trask <joshtrask@google.com> 1589987574 -0400

Merging from ub-launcher3-rvc-dev @ build 6511067

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

Change-Id: Ifc8c251ef0f03e66de3b1c9fa94bfcb980704769