This reverts commit 44f5215e. Reason for revert: <Make Ime test in SystemDecorationTest failed> Bug: 130715649 Change-Id: I9afb1d5ee7e7a4f1e7de6fa4c7c3ec5dcc336f08