Reconcile difference between master and ub-launcher3-master

b/129423457

Change-Id: I63e2a1a6b40ced849e852f1b7bffa4e9fa177f18
1 file changed