f69563e935
This reverts commit a66dafe617.
Reason for revert: b/159183864 introduce com.android.launcher3.memory.MemoryTests failed after this CL merged.
Due to I need more time to investigate the root cause and do not block MemoryTests, revert this CL temporary.
Change-Id: I0408123e36c55a262ee0f1080cd6612785b3f527