Merge "DO NOT MERGE Fix for testActivityLifeCycleOnResizeFreeformTask" into stage-aosp-oc-cts-dev
am: 8f17c49aa1  -s ours

Change-Id: I75a31b355487310b47445640e1b1ad45fc7c9c5a