tree aa55580f4bf4e6b9cacc3f52c1c3794b9297e1d5
parent 2a5b3d8f20cf115320d3cd0f790ce4ada38ca726
parent e433812907689bf58f1c05688ef17e9ad29ac805
author TreeHugger Robot <treehugger-gerrit@google.com> 1586969694 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586969694 +0000

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

Change-Id: Ibf3afbd597fd1d770f7ec9ade2e4b721be2fa4c5