Merge "Merge "Fixed deadlock between AM and WM when animating pinned stack."...
Merge "Merge "Fixed deadlock between AM and WM when animating pinned stack." into nyc-dev am: 3a94ec56 am: 97c1a72c" into nyc-mr1-dev-plus-aosp
am: 3753902f
* commit '3753902f':
Change-Id: Id15848045d2a4470639f325f63f23e2c81e2eb0c