Merge "Merge "Correct activity lifecycle when forcedResize activity is finished" into nyc-dev am: 4570df8fd5 am: c46cc608bc" into nyc-mr1-dev-plus-aosp
am: f2bdf486f7
* commit 'f2bdf486f7b8aeaad5ec9b85540042f88567b0e9':
Change-Id: I5b142035d533b43481a4f1fa21b5850515e9e1ce
This commit is contained in: