Merge "Try to avoid the timing UI issue" into udc-dev am: c4ed48cb

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



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