Merge "Merge branch \'ub-launcher3-burnaby-nyc\' into launcher3merge am: 8c340dff19 am: 8249b928b7" into nyc-mr1-dev-plus-aosp
am: 3a40216fa0

Change-Id: I9771f7311fd49a535e91fc559024c9e17cff8cbb