Merge "Merge "Merge "DO NOT MERGE Fix for testConfigurationUpdatesWhenRotatingToSideFromDocked" into oreo-cts-dev am: 323d2e17e0  -s ours" into oreo-mr1-cts-dev am: d40c71a31f  -s ours"