tree 1c135e5e2d0e85f84451fcc21e8ad3ea6ad8c91e
parent a45552c090fea9c3d71fd7e07bc682f7dac6b1b2
parent 8bdd83ec1b05d618dffbac4bdc31cd6be84d90ff
author Hyunyoung Song <hyunyoungs@google.com> 1574204548 -0800
committer Hyunyoung Song <hyunyoungs@google.com> 1574212333 -0800

Merging from ub-launcher3-master @ build 6018909

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

Change-Id: I8a1e20d0b175f03a1a05c81749f07ab5314e872a