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

Change-Id: I7909790b1a06df72d3bfd4c92beb29e0c3c43e07