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

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



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