This reverts commit f8ebb8da. Reason for revert: b/271833143 - breaks system dream on tablets Change-Id: I1dc0c018c170061653fa13ef4121be9758a343b8