Revert "DO NOT MERGE: Cts test failed on small display" This reverts commit d936ccca66e0ce885b31c236d1c5d2004b1a2c9d. Reason for revert: Potential Culprit of b/296927940 Change-Id: Ie2a78c87cf4a3c9af639db5b8ca72b9a46c8f76d