Conflicts: tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java tests/tests/view/src/android/view/cts/WindowTest.java Change-Id: Ibf7651011e4e594d0173c90f6341f75a9e71d45b