Fix merge issue in CompatChangeTests

Fix: 204041050
Test: atest CtsWindowManagerDeviceTestCases:CompatChangeTests
Change-Id: I159fbfc53d43061525458a85b7be0d7ffd2dab6b
1 file changed