Merge "Merge "Force windows to be scalable during pinned animation." into...
Merge "Merge "Force windows to be scalable during pinned animation." into nyc-dev am: 4e9a9dfb am: e9e87a80" into nyc-mr1-dev-plus-aosp
am: 93bcd884
* commit '93bcd884':
Change-Id: I0bcf2aedd035bf458852bdd986fa9a54f4cc31cc