Merge "Fix flaky: testKeyguardShowHideOverSplitScreen and testLaunchActivityWithFlagClearTop" into qt-dev am: f6f63054af
am: ac06a267dc

Change-Id: If2737b785e628c99124824cce495cfcfd1dab5f1