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
am: 5b9d5fe6
Change-Id: Ie359b22486c753a98522882c021e90f8b4c1be63