8d55819f6e
This reverts commit 4937d79c03.
Reason for revert: Breaking launcher tests on cf foldable and tablet targets
Bug: 223485229
Change-Id: I7a54982967426c4da9eb62ba100226102be6549e