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

Change-Id: I5c5354ac596a2be5e1b9286a35cb0a8d4aa4110a