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

Change-Id: Ibf3afbd597fd1d770f7ec9ade2e4b721be2fa4c5