tree cbc9291205f77c315e95b6733b77292b49672886
parent b6c569171a5287f8228d93298932e60aeb57ceca
parent 68c97cf5ac074b289ffabd135d49d06f8ffc798d
author Hyunyoung Song <hyunyoungs@google.com> 1567016919 -0700
committer Hyunyoung Song <hyunyoungs@google.com> 1567016919 -0700

Merging from ub-launcher3-qt-qpr1-dev @ build 5834630

Test: manual, presubmit on the source branch
http://x20/teams/android-sysui/merge/ub-launcher3-qt-qpr1-dev_5834630.html

Change-Id: I39968f831d707800207303e7661193fd74e56124