This reverts commit 36dcd2e3. Bug: 130553898 Reason for revert: Breaks other CTS (PopupWindowTests) Change-Id: Ib3a0a189db25d72e85a52dcefa9e1f52a976f3fb