Merge "SettingsRoboTests: fix device state rotation related tests" into...

Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f62 am: 00259adc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697



Change-Id: If64d6ee2186bb42b775159ddd3dd29bf03b5cf42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>