Merge "Only use WM screen rotation animation on default display" into oc-mr1-dev
am: f394ac4eba

Change-Id: I6518a549ae00e5f06907d01a1337a09b2e2c4614