tree 2c5203c0f6d5d65e0b03f5eeb2615b9773e4ab78
parent 94dbcefe2a12d33c5e85686632577f7568051b62
parent 107fe60f6ef5b3336ece35122650d9ccc1c69913
author Tony Wickham <twickham@google.com> 1597717102 -0700
committer Tony Wickham <twickham@google.com> 1597726750 +0000

Merging from ub-launcher3-rvc-qpr-dev @ build 6770831

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

Change-Id: Ic07dd8bd495cd0e013a00a29d9d9f11e246dc568
Merged-In: I5e9c73a7ac3033fe82006c4bd72824f56b8988f8