Merge "Merge "Merge "Fix for testActivityLifeCycleOnResizeFreeformTask" into nougat-cts-dev am: 00a4662ae8" into nougat-mr1-cts-dev am: 9ede5cb248" into oreo-cts-dev