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

Change-Id: I0c35d1d42648ecdc0cdb84cef6e8e67a65a93e5e