This reverts commit 9acce426. Underlying issue fixed in follow up CL. Test: PopupWindowTest Bug: 130231322 Bug: 130553898 Change-Id: I5e332394868eb26ef44ce155bc41eb4405d0093a