Test: atest WmTests
Bug: 113800711
Merged-In: I1e29cc9116adf2d08c00d035ecad48e4ef604106
Change-Id: Ifcbd8cf4545ec80058dc25ef15f5af81a9780cc3
(cherry picked from commit bc7bc12fee)
Test: atest WmTests
Bug: 113800711
Merged-In: I1e29cc9116adf2d08c00d035ecad48e4ef604106
Change-Id: Ifcbd8cf4545ec80058dc25ef15f5af81a9780cc3
(cherry picked from commit bc7bc12fee)