tree b47446fde974204966e94fd31b3df2cba792de77
parent 2442a351da7cedd9456654c616d9b81eefab8658
parent 800aaa0d3263232d03289e2b5dad0fb2a0e8e33b
author Tracy Zhou <tracyzhou@google.com> 1577132675 -0800
committer Tracy Zhou <tracyzhou@google.com> 1577132675 -0800

Merging from ub-launcher3-master @ build 6094789

Test: manual, presubmit on the source branch
http://x20/teams/android-launcher/merge/ub-launcher3-master_6094789.html

Change-Id: Iebd789eadfae2930807cc28373c2e1765f70e481