Merge "Correct activity lifecycle when forcedResize activity is finished" into nyc-dev
am: 4570df8fd5

* commit '4570df8fd52b4ca8fab00794297a4f3d3923bbfb':
  Correct activity lifecycle when forcedResize activity is finished

Change-Id: I0cbcab2b84c32b0c8add13ddbb9cc7984d18a61f