tree bba478bdf1900608e5f63eba81fcd179db9cb1db
parent 685e29b2369ac0e55c8210a9d83cc22b613a97fd
parent ac327df55ce5560f2038d4cebbd20144e5510bca
author James O'Leary <jamesoleary@google.com> 1588888431 -0400
committer James O'Leary <jamesoleary@google.com> 1588888431 -0400

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

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

Change-Id: Ia2feae3192f875638692e55f4c88746c0a8159a3