This reverts commit 71a61f89. Reason for revert: Breaking dpi.cts.ConfigurationScreenLayoutTest Bug: b/210551101 Change-Id: Idbaa8a663e0d6ea44fbfe4dea3943470cb94e3bd