tree 30a51c9388c107a8b09d102c806491b6f29a4a23
parent 7c9f8742dcece090753d05f5c51b98be0eb00fbe
parent 5777750c3153efa26ed01945d5cb89379d77ffcb
author Tony Wickham <twickham@google.com> 1597726055 -0700
committer Tony Wickham <twickham@google.com> 1597726794 +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: I61b9e54537d5fb29fb01d4df25a95a35d6964190
Merged-In: I7f90d00ecb2ed81c8d4921007b249a58ecf055b0