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

Change-Id: I4690e7c5917fc321ee0f0982f2041850dd2a8937