Merge "Merging  ub-launcher3-qt-dev, build 5619253 am: 0ef6fe00b0 am: 077965d075" into qt-r1-dev-plus-aosp
am: 24fbc1bcd7

Change-Id: Ib7249bf44759545c719199d707fd3a7ef9c18629