Merge "DO NOT MERGE Fix for testConfigurationUpdatesWhenRotatingToSideFromDocked" into oreo-cts-dev