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