Merge "Merge "Overlay icons for overview and work icon" into rvc-dev am:...
Merge "Merge "Overlay icons for overview and work icon" into rvc-dev am: 9b98d6be am: 6ceab7b8" into rvc-d1-dev-plus-aosp am: 029c8a62
Change-Id: Iff926afc42f17dea3d68a9ee4d6ee98eab761c68