Test: SystemUITests, CtsAppTestCases Fixes: 198825327 Change-Id: I7a4868a56bc2c9a69d2fb1eae5d53faa3c9dede0