Merge "Cleanup code related to ag/11035582" into ub-launcher3-rvc-dev am: 8f3c7c23d6

Change-Id: I371d4a7549df0391e50b5423899a1cdc8aae3d3d