tree ad25f825581ad9977f3a9c9ebbb80807ba502a47
parent 94c1178e47de6e25a59797b664f990af75cae5ff
parent b8d1e3526bb9fda74e683b8af87761aad2ebd53a
author Jon Miranda <jonmiranda@google.com> 1582146670 -0800
committer Jon Miranda <jonmiranda@google.com> 1582146670 -0800

Merging from ub-launcher3-master @ build 6219992

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

Change-Id: Iff1e0d32b4ded4cb51c91c187d85f128b92157ca