Merge "Merge "Fixes for ending PiP animation." into nyc-dev am: bc9edc7ccb am: cd1a9642e8" into nyc-mr1-dev-plus-aosp
am: 6ee6ba515a
* commit '6ee6ba515a2920345f871b3e06f79ae5e87790fb':
Change-Id: I88c26260241959101a8b0d58633c7dc7930fbc85
This commit is contained in: