Merge "Don't call into AM finish-recents-animation while holding onto the WM lock" into pi-dev
am: 4187c1d9d0

Change-Id: I2b9a9cc997b80fb40388ca7d999ee1f2380d5fc6