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: 2df3cf33
* commit '2df3cf33':
Change-Id: Iddeb88d845cb73b3dc8d14fe9d690229a49cea62