Merge "Merge "Fix for testActivityLifeCycleOnResizeFreeformTask" into nougat-mr1-cts-dev am: 75a1919259"