Merge \"Merge \\\"PiP animation: Move window with resize when ending animation.\\\" into nyc-dev am: 4624d687f7 am: c28647084e\" into nyc-mr1-dev-plus-aosp
am: 797f91b6ba

Change-Id: Iad874228fa8c90df5c2c5a8668880e695729d957