Merge "The dialog should persist after rotation." into udc-dev am: 74042f59

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



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