Merge "Merge "Merge "Ensure that all displays are updated upon any changes to...
Merge "Merge "Merge "Ensure that all displays are updated upon any changes to rotation." into oc-dr1-dev am: adec8518" into oc-mr1-dev am: 988a6dd5" into oc-mr1-dev-plus-aosp